From 0b298b5e46cac2c4d279b9a51a4e7f009531f9be Mon Sep 17 00:00:00 2001 From: Wouter R Date: Thu, 4 Jul 2013 17:26:13 +0200 Subject: [PATCH] Change require statements in code to reflect new structure; rename autowifi -> wifibox everywhere. --- post-install.sh | 21 ++++++++++++++------- pre-remove.sh | 4 +++- src/main.lua | 6 +++--- src/network/netconfig.lua | 4 ++-- src/network/wlanconfig.lua | 2 +- src/www/captive.keep/index.html | 4 ++-- src/www/wifibox/index.html | 2 +- src/www/wifibox/wifibox.html | 4 ++-- 8 files changed, 28 insertions(+), 19 deletions(-) diff --git a/post-install.sh b/post-install.sh index 922fc1d..2f4ce69 100755 --- a/post-install.sh +++ b/post-install.sh @@ -54,21 +54,28 @@ if [ $? -eq 1 ]; then cat <<-EOM >> /root/.profile # DO NOT MODIFY - this block of lines has been added by the wifibox package. - alias wfcfr='/usr/share/lua/autowifi/ext/wfcf' + alias d3dapi='/usr/share/lua/wifibox/script/d3dapi' alias encore='ulimit -c unlimited' EOM fi ### Finally make sure basic configuration is set correctly -echo "Enabling wifi device..." -uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi +echo "s_$IPKG_INSTROOT_" +echo "ss_$$IPKG_INSTROOT_" +echo "ssa_$${IPKG_INSTROOT}_" +if [ -z "$IPKG_INSTROOT" ]; then + echo "Enabling wifi device..." + uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi -addFirewallNet + addFirewallNet -echo "Adding network interface 'wlan'..." -uci set network.wlan=interface; uci commit network; /etc/init.d/network reload + echo "Adding network interface 'wlan'..." + uci set network.wlan=interface; uci commit network; /etc/init.d/network reload -[ -z "$$IPKG_INSTROOT" ] || { /etc/init.d/autowifi_init enable; } + /etc/init.d/wifibox_init enable +else + echo "WARNING: WiFiBox network configuration can only be prepared when installing on real device" +fi exit 0 diff --git a/pre-remove.sh b/pre-remove.sh index 0652fbc..bbe80b5 100644 --- a/pre-remove.sh +++ b/pre-remove.sh @@ -1,5 +1,7 @@ #!/bin/sh -[ -z "$$IPKG_INSTROOT" ] || { /etc/init.d/autowifi_init disable; } +if [ -z "$$IPKG_INSTROOT" ]; then + /etc/init.d/autowifi_init disable +fi exit 0 diff --git a/src/main.lua b/src/main.lua index 7ed0751..c51e55a 100644 --- a/src/main.lua +++ b/src/main.lua @@ -18,10 +18,10 @@ io.write ("Content-type: text/plain\r\n\r\n") local u = require("util") local l = require("logger") -local wifi = require("wifihelper") -local reconf = require("reconf") +local wifi = require("network.wlanconfig") +local reconf = require("network.netconf") +local urlcode = require("util.urlcode") local uci = require("uci").cursor() -local urlcode = require("urlcode") local iwinfo = require("iwinfo") local argOperation, argDevice, argSsid, argPhrase, argRecreate diff --git a/src/network/netconfig.lua b/src/network/netconfig.lua index 59cea0b..a8778f6 100644 --- a/src/network/netconfig.lua +++ b/src/network/netconfig.lua @@ -7,8 +7,8 @@ local reconf = {} local wifi local reloadSilent -M.WWW_CAPTIVE_PATH = "/usr/share/lua/autowifi/ext/www" -M.WWW_CAPTIVE_INDICATOR = "/www/.autowifi-inplace" +M.WWW_CAPTIVE_PATH = "/usr/share/lua/wifibox/ext/www" +M.WWW_CAPTIVE_INDICATOR = "/www/.wifibox-inplace" M.WWW_RENAME_NAME = "/www-regular" diff --git a/src/network/wlanconfig.lua b/src/network/wlanconfig.lua index 3124a7a..1c16dc7 100644 --- a/src/network/wlanconfig.lua +++ b/src/network/wlanconfig.lua @@ -1,4 +1,4 @@ -local reconf = require("reconf") +local reconf = require("network.netconf") local util = require("util") local l = require("logger") local uci = require("uci").cursor() diff --git a/src/www/captive.keep/index.html b/src/www/captive.keep/index.html index 1d941ee..c86bbee 100644 --- a/src/www/captive.keep/index.html +++ b/src/www/captive.keep/index.html @@ -2,9 +2,9 @@ - + -Doodle 3D - Wireless Network Configuration +Doodle 3D - Wireless Network Configuration diff --git a/src/www/wifibox/index.html b/src/www/wifibox/index.html index eee6fda..2f5c98d 100644 --- a/src/www/wifibox/index.html +++ b/src/www/wifibox/index.html @@ -3,5 +3,5 @@ Updates
- Wireless network management
+ Wireless network management
diff --git a/src/www/wifibox/wifibox.html b/src/www/wifibox/wifibox.html index b4c1ad3..3da96f9 100644 --- a/src/www/wifibox/wifibox.html +++ b/src/www/wifibox/wifibox.html @@ -4,8 +4,8 @@ Wireless configuration - - + +