vmario/doodle3d-firmware
0
0
Fork 0
mirror of https://github.com/Doodle3D/doodle3d-firmware.git synced 2024-12-22 11:03:48 +01:00
Code Issues Releases Wiki Activity

Properly start and stop signin.sh on package installation and removal.

Browse Source 
Clean up package Makefile (it installed and removed too much).
This commit is contained in:
Wouter R 2013-10-22 22:44:51 +02:00
parent 5c7df6da36
commit 9e0eab1f8d
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -109,11 +109,8 @@ define Package/wifibox/install
$(CP) $(WIFIBOX_BASE_DIR)/FIRMWARE-VERSION $(1)/etc/wifibox-version $(CP) $(WIFIBOX_BASE_DIR)/FIRMWARE-VERSION $(1)/etc/wifibox-version
ifeq ($(CONFIG_WIFIBOX_DEVEL_PACKAGE),y) ifeq ($(CONFIG_WIFIBOX_DEVEL_PACKAGE),y)
# $(INSTALL_DIR) $(1)/$(TGT_LUA_DIR_SUFFIX)/misc # $(INSTALL_DIR) $(1)/$(TGT_LUA_DIR_SUFFIX)/test
# $(CP) $(WIFIBOX_BASE_DIR)/../misc/collect-code.sh $(1)/$(TGT_LUA_DIR_SUFFIX)/misc/ # $(CP) $(WIFIBOX_BASE_DIR)/test/* $(1)/$(TGT_LUA_DIR_SUFFIX)/test/
$(INSTALL_DIR) $(1)/$(TGT_LUA_DIR_SUFFIX)/test
$(CP) $(WIFIBOX_BASE_DIR)/test/* $(1)/$(TGT_LUA_DIR_SUFFIX)/test/
# $(LN) -s /$(TGT_LUA_DIR_SUFFIX)/test $(1)/www/ # $(LN) -s /$(TGT_LUA_DIR_SUFFIX)/test $(1)/www/
endif endif

1
post-install.sh
View File

@ -70,6 +70,7 @@ fi
### Finally make sure basic configuration is set correctly ### Finally make sure basic configuration is set correctly
$IPKG_INSTROOT/etc/init.d/wifibox enable $IPKG_INSTROOT/etc/init.d/wifibox enable
$IPKG_INSTROOT/etc/init.d/wifibox start
if [ -z "$IPKG_INSTROOT" ]; then if [ -z "$IPKG_INSTROOT" ]; then
echo "Enabling wifi device..." echo "Enabling wifi device..."

9
post-remove.sh
View File

@ -14,14 +14,7 @@ rmdir /usr/share/lua/wifibox/util
rmdir /usr/share/lua/wifibox rmdir /usr/share/lua/wifibox
rmdir /usr/share/lua rmdir /usr/share/lua
# Try to remove all www directories used by the package, and intentionally leave anything non-empty alone #rm /www/test 2> /dev/null
rmdir /www/js/libs
rmdir /www/js
rmdir /www/img/buttons
rmdir /www/img
rmdir /www/css
rm /www/test 2> /dev/null
rmdir /www/cgi-bin
echo "The wifibox banner has been removed. Changes to the root profile however, have" echo "The wifibox banner has been removed. Changes to the root profile however, have"
echo "not been reverted, as haven't the wlan firewall zone and the radio0 device state." echo "not been reverted, as haven't the wlan firewall zone and the radio0 device state."

1
pre-remove.sh
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
$IPKG_INSTROOT/etc/init.d/wifibox stop
$IPKG_INSTROOT/etc/init.d/wifibox disable $IPKG_INSTROOT/etc/init.d/wifibox disable
exit 0 exit 0

2
src/FIRMWARE-VERSION
View File

@ -1 +1 @@
0.9.1 0.9.2

17
src/script/wifibox_init
View File

@ -15,10 +15,15 @@ boot() {
/usr/share/lua/wifibox/script/signin.sh > /dev/null 2> /dev/null & /usr/share/lua/wifibox/script/signin.sh > /dev/null 2> /dev/null &
} }
#start() { start() {
# $LOGGER "dummy start" ps | awk '{print $5}' | grep '{signin.sh}'
#} if [ $? -eq 1 ]; then
$LOGGER "Start signing in..."
/usr/share/lua/wifibox/script/signin.sh > /dev/null 2> /dev/null &
fi
}
#stop() { stop() {
# $LOGGER "dummy stop" $LOGGER "Stop signing in..."
#} killall signin.sh
}