瀏覽代碼

Removing trap

Bob Mottram 7 年之前
父節點
當前提交
f13c18092f
共有 1 個檔案被更改,包括 5 行新增3 行删除
  1. 5
    3
      src/freedombone-app-postactiv

+ 5
- 3
src/freedombone-app-postactiv 查看文件

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