Bob Mottram 7 lat temu
rodzic
commit
f13c18092f
1 zmienionych plików z 5 dodań i 3 usunięć
  1. 5
    3
      src/freedombone-app-postactiv

+ 5
- 3
src/freedombone-app-postactiv Wyświetl plik

@@ -119,7 +119,6 @@ function install_interactive_postactiv {
119 119
         while [ ! $POSTACTIV_DETAILS_COMPLETE ]
120 120
         do
121 121
             data=$(mktemp 2>/dev/null)
122
-            trap "rm -f $data" 0 1 2 5 15
123 122
             if [[ $DDNS_PROVIDER == "default@freedns.afraid.org" ]]; then
124 123
                 dialog --backtitle $"Freedombone Configuration" \
125 124
                        --title $"PostActiv Configuration" \
@@ -140,8 +139,10 @@ function install_interactive_postactiv {
140 139
             fi
141 140
             sel=$?
142 141
             case $sel in
143
-                1) exit 1;;
144
-                255) exit 1;;
142
+                1) rm -f "$data"
143
+                   exit 1;;
144
+                255) rm -f "$data"
145
+                     exit 1;;
145 146
             esac
146 147
             POSTACTIV_DOMAIN_NAME=$(sed -n 1p < "$data")
147 148
             title=$(sed -n 2p < "$data")
@@ -174,6 +175,7 @@ function install_interactive_postactiv {
174 175
             if [ $POSTACTIV_DOMAIN_NAME ]; then
175 176
                 POSTACTIV_DETAILS_COMPLETE="yes"
176 177
             fi
178
+            rm -f "$data"
177 179
         done
178 180
 
179 181
         # remove any invalid characters