Merge pull request #1 from samtap/master

pull
pattyland · Oct 2, 2018 · d6e3209 · d6e3209
2 parents 3f7918d + d924b1f
commit d6e3209
Show file tree

Hide file tree

Showing 263 changed files with 19 additions and 1,121 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,8 @@
+[submodule "bootstrap"]
+	path = bootstrap
+	url = https://github.com/samtap/fang-hacks
+	branch = bootstrap
+[submodule "data"]
+	path = data
+	url = https://github.com/samtap/fang-hacks.git
+	branch = xf-data
diff --git a/README.md b/README.md
@@ -2,6 +2,10 @@
 
 Collection of modifications for the XiaoFang WiFi Camera
 
+**For questions, support and collaboration please join us on gitter. The discord channel is not used anymore.**
+
+[![Join the chat at https://gitter.im/samtap/fang-hacks](https://badges.gitter.im/samtap/fang-hacks.svg)](https://gitter.im//fang-hacks/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 ## General usage
 
 Download an sd-card image from the [releases](https://github.com/samtap/fang-hacks/releases) page or follow the manual steps below.
@@ -56,6 +60,5 @@ By default the following services are enabled:
 - A script controls the IR filter and LEDs
 - Manage the device via the status page ```http://device-ip/cgi-bin/status```
 
-## Support
-For questions, suggestions or just general discussion, please join #fanghacks on irc.freenode.net
-There's also a discord channel: https://discord.gg/xhRzpPn
+## License
+Any files in this repo that are not already licensed (i.e. my scripts and tools but *not* 3rd party binaries like busybox, dropbear et.al) are licensed under [CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/). 
diff --git a/bootstrap/www/network b/bootstrap/www/network
@@ -280,10 +280,10 @@ echo "<option value='' disabled selected style='display:none;'>Label</option>"
 
 hidden=""
 while read x; do
-  SSID=$(echo $x | cut -d' ' -f1)
-  ADDR=$(echo $x | cut -d' ' -f2)
-  ENC=$(echo $x | cut -d' ' -f3)
-  QUAL=$(echo $x | cut -d' ' -f4)
+  SSID=$(echo "$x" | cut -f1)
+  ADDR=$(echo "$x" | cut -f2)
+  ENC=$(echo "$x" | cut -f3)
+  QUAL=$(echo "$x" | cut -f4)
   echo "<option id=\"${SSID}_OPT\">$SSID</option>"
   hidden="$hidden 
          <input type='hidden' id=\"${SSID}_QUAL\" value=\"$QUAL\"/> 

diff --git a/data b/data
diff --git a/data/.resize b/data/.resize
diff --git a/data/bin/ash b/data/bin/ash
diff --git a/data/bin/busybox b/data/bin/busybox
diff --git a/data/bin/cat b/data/bin/cat
diff --git a/data/bin/chgrp b/data/bin/chgrp
diff --git a/data/bin/chmod b/data/bin/chmod
diff --git a/data/bin/chown b/data/bin/chown
diff --git a/data/bin/cp b/data/bin/cp
diff --git a/data/bin/date b/data/bin/date
diff --git a/data/bin/dd b/data/bin/dd
diff --git a/data/bin/df b/data/bin/df
diff --git a/data/bin/dmesg b/data/bin/dmesg
diff --git a/data/bin/dnsdomainname b/data/bin/dnsdomainname
diff --git a/data/bin/echo b/data/bin/echo
diff --git a/data/bin/egrep b/data/bin/egrep
diff --git a/data/bin/false b/data/bin/false
diff --git a/data/bin/fang_login b/data/bin/fang_login
diff --git a/data/bin/fgrep b/data/bin/fgrep
diff --git a/data/bin/fsync b/data/bin/fsync
diff --git a/data/bin/getopt b/data/bin/getopt
diff --git a/data/bin/grep b/data/bin/grep
diff --git a/data/bin/gunzip b/data/bin/gunzip
diff --git a/data/bin/gzip b/data/bin/gzip
diff --git a/data/bin/hostname b/data/bin/hostname
diff --git a/data/bin/iostat b/data/bin/iostat
diff --git a/data/bin/kill b/data/bin/kill
diff --git a/data/bin/ln b/data/bin/ln
diff --git a/data/bin/login b/data/bin/login
diff --git a/data/bin/ls b/data/bin/ls
diff --git a/data/bin/mkdir b/data/bin/mkdir
diff --git a/data/bin/mknod b/data/bin/mknod
diff --git a/data/bin/mktemp b/data/bin/mktemp
diff --git a/data/bin/more b/data/bin/more
diff --git a/data/bin/mount b/data/bin/mount
diff --git a/data/bin/mt b/data/bin/mt
diff --git a/data/bin/mv b/data/bin/mv
diff --git a/data/bin/netstat b/data/bin/netstat
diff --git a/data/bin/nice b/data/bin/nice
diff --git a/data/bin/pidof b/data/bin/pidof
diff --git a/data/bin/ping b/data/bin/ping
diff --git a/data/bin/ping6 b/data/bin/ping6
diff --git a/data/bin/printenv b/data/bin/printenv
diff --git a/data/bin/ps b/data/bin/ps
diff --git a/data/bin/pwd b/data/bin/pwd
diff --git a/data/bin/rm b/data/bin/rm
diff --git a/data/bin/rmdir b/data/bin/rmdir
diff --git a/data/bin/run-parts b/data/bin/run-parts
diff --git a/data/bin/sed b/data/bin/sed
diff --git a/data/bin/setserial b/data/bin/setserial
diff --git a/data/bin/sh b/data/bin/sh
diff --git a/data/bin/sleep b/data/bin/sleep
diff --git a/data/bin/stty b/data/bin/stty
diff --git a/data/bin/su b/data/bin/su
diff --git a/data/bin/sync b/data/bin/sync
diff --git a/data/bin/tar b/data/bin/tar
diff --git a/data/bin/touch b/data/bin/touch
diff --git a/data/bin/true b/data/bin/true
diff --git a/data/bin/umount b/data/bin/umount
diff --git a/data/bin/uname b/data/bin/uname
diff --git a/data/bin/usleep b/data/bin/usleep
diff --git a/data/bin/vi b/data/bin/vi
diff --git a/data/bin/watch b/data/bin/watch
diff --git a/data/bin/zcat b/data/bin/zcat
diff --git a/data/etc/hostapd.conf b/data/etc/hostapd.conf
diff --git a/data/etc/profile b/data/etc/profile
diff --git a/data/etc/scripts/00-stop-cloud b/data/etc/scripts/00-stop-cloud