v0.9.3. DATA_DIR moved to /tmp

autoinstall/uninstall.sh

@@ -10,10 +10,8 @@ BACKUP_DIR="${RUAB_CFG_DIR}/autoinstall.bak.`date +%s`"
 HTDOCS_VIEW="${PREFIX}/www/luci-static/resources/view"
 HTDOCS_RUAB="${HTDOCS_VIEW}/ruantiblock"
 CRONTAB_FILE="/etc/crontabs/root"
-DATA_DIR="${RUAB_CFG_DIR}/var"
-DATA_DIR_RAM="/var/ruantiblock"
-RC_LOCAL="/etc/rc.local"
-DNSMASQ_CONF_LINK="/tmp/dnsmasq.d/ruantiblock.conf"
+DATA_DIR="/tmp/ruantiblock"
+DNSMASQ_DATA_FILE="/tmp/dnsmasq.d/ruantiblock.conf"
 ### ruantiblock
 FILE_CONFIG="${RUAB_CFG_DIR}/ruantiblock.conf"
 FILE_FQDN_FILTER="${RUAB_CFG_DIR}/fqdn_filter"
@@ -61,7 +59,6 @@ BackupCurrentConfig() {
 }
 
 AppStop() {
-    rm -f $DNSMASQ_CONF_LINK
     FileExists "$FILE_MAIN_SCRIPT" && $FILE_MAIN_SCRIPT destroy
 }
 
@@ -76,12 +73,6 @@ RemoveCronTask() {
     /etc/init.d/cron restart
 }
 
-RemoveRcLocalEntry() {
-    $AWK_CMD -v FILE_MAIN_SCRIPT="$FILE_MAIN_SCRIPT" '$0 !~ FILE_MAIN_SCRIPT {
-        print $0;
-    }' "$RC_LOCAL" > "${RC_LOCAL}.tmp" && mv -f "${RC_LOCAL}.tmp" "$RC_LOCAL"
-}
-
 RestoreTorConfig() {
     [ -e "${FILE_TORRC}.bak" ] && mv -f "${FILE_TORRC}.bak" "$FILE_TORRC"
     if [ -x "/etc/init.d/tor" ]; then
@@ -93,9 +84,9 @@ RestoreTorConfig() {
 
 RemoveAppFiles() {
     RestoreTorConfig
-    rm -rf "$DATA_DIR"
-    rm -rf "$DATA_DIR_RAM"
     $OPKG_CMD remove ruantiblock-mod-py ruantiblock-mod-lua luci-i18n-ruantiblock-ru luci-app-ruantiblock ruantiblock
+    rm -f "$DNSMASQ_DATA_FILE"
+    rm -rf "$DATA_DIR"/*
     rmdir "${RUAB_CFG_DIR}/scripts" 2> /dev/null
     rmdir "$HTDOCS_RUAB" 2> /dev/null
     rm -f /tmp/luci-modulecache/* /tmp/luci-indexcache*
@@ -126,10 +117,9 @@ ConfirmRemove() {
 
 ConfirmRemove
 AppStop
-BackupCurrentConfig
+#BackupCurrentConfig
 DisableStartup
 RemoveCronTask
-RemoveRcLocalEntry
 RemoveAppFiles
 
 exit 0