瀏覽代碼

Remove commit if the old inadyn binary is found

Bob Mottram 7 年之前
父節點
當前提交
105c2a78e3
共有 1 個檔案被更改,包括 6 行新增3 行删除
  1. 6
    3
      src/freedombone-utils-web

+ 6
- 3
src/freedombone-utils-web 查看文件

489
         sed -i '/INADYN_COMMIT/d' "$CONFIGURATION_FILE"
489
         sed -i '/INADYN_COMMIT/d' "$CONFIGURATION_FILE"
490
     fi
490
     fi
491
 
491
 
492
+    if [ -f /usr/local/sbin/inadyn ]; then
493
+        if grep -q "inadyn commit" "$COMPLETION_FILE"; then
494
+            sed -d '/inadyn commit/d' "$COMPLETION_FILE"
495
+        fi
496
+    fi
497
+
492
     CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit")
498
     CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit")
493
     echo "************ 3 $CURR_INADYN_COMMIT $INADYN_COMMIT"
499
     echo "************ 3 $CURR_INADYN_COMMIT $INADYN_COMMIT"
494
     if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then
500
     if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then
497
 
503
 
498
     echo "************ 4"
504
     echo "************ 4"
499
     if [ -f /usr/local/sbin/inadyn ]; then
505
     if [ -f /usr/local/sbin/inadyn ]; then
500
-        if grep -q "inadyn commit" "$COMPLETION_FILE"; then
501
-            sed -d '/inadyn commit/d' "$COMPLETION_FILE"
502
-        fi
503
         if [ -d "$INSTALL_DIR/inadyn" ]; then
506
         if [ -d "$INSTALL_DIR/inadyn" ]; then
504
             rm -rf "$INSTALL_DIR/inadyn"
507
             rm -rf "$INSTALL_DIR/inadyn"
505
         fi
508
         fi