瀏覽代碼

Create addremove script

Bob Mottram 8 年之前
父節點
當前提交
76b24ec257
共有 4 個檔案被更改,包括 11 行新增3 行删除
  1. 1
    0
      Makefile
  2. 6
    2
      src/freedombone-addremove
  3. 1
    1
      src/freedombone-controlpanel
  4. 3
    0
      src/freedombone-prepare-scripts

+ 1
- 0
Makefile 查看文件

64
 	rm -rf /etc/${APP}
64
 	rm -rf /etc/${APP}
65
 	rm -f ${PREFIX}/bin/control
65
 	rm -f ${PREFIX}/bin/control
66
 	rm -f ${PREFIX}/bin/controluser
66
 	rm -f ${PREFIX}/bin/controluser
67
+	rm -f ${PREFIX}/bin/addremove
67
 	bash -c "./translate uninstall"
68
 	bash -c "./translate uninstall"
68
 clean:
69
 clean:
69
 	rm -f \#* \.#* debian/*.substvars debian/*.log src/*~
70
 	rm -f \#* \.#* debian/*.substvars debian/*.log src/*~

+ 6
- 2
src/freedombone-addremove 查看文件

38
     PROJECT_INSTALL_DIR=/usr/bin
38
     PROJECT_INSTALL_DIR=/usr/bin
39
 fi
39
 fi
40
 
40
 
41
-source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
42
-
43
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
41
 COMPLETION_FILE=$HOME/${PROJECT_NAME}-completed.txt
44
 CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
42
 CONFIGURATION_FILE=$HOME/${PROJECT_NAME}.cfg
45
 
43
 
44
+# Start including files
45
+
46
+source $PROJECT_INSTALL_DIR/${PROJECT_NAME}-vars
47
+
46
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
48
 UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
47
 for f in $UTILS_FILES
49
 for f in $UTILS_FILES
48
 do
50
 do
55
   source $f
57
   source $f
56
 done
58
 done
57
 
59
 
60
+# End including files
61
+
58
 function mark_unselected_apps_as_removed {
62
 function mark_unselected_apps_as_removed {
59
     # Initially mark the apps not chosen on first install as being removed
63
     # Initially mark the apps not chosen on first install as being removed
60
     # otherwise they may be automatically installed on the next update
64
     # otherwise they may be automatically installed on the next update

+ 1
- 1
src/freedombone-controlpanel 查看文件

2135
             4) show_firewall;;
2135
             4) show_firewall;;
2136
             5) reset_tripwire;;
2136
             5) reset_tripwire;;
2137
             6) menu_app_settings;;
2137
             6) menu_app_settings;;
2138
-            7) ${PROJECT_NAME}-addremove
2138
+            7) /usr/local/bin/addremove
2139
                if [ ! "$?" = "0" ]; then
2139
                if [ ! "$?" = "0" ]; then
2140
                    any_key
2140
                    any_key
2141
                fi
2141
                fi

+ 3
- 0
src/freedombone-prepare-scripts 查看文件

34
 
34
 
35
 cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel > /usr/local/bin/control
35
 cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel > /usr/local/bin/control
36
 cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel-user > /usr/local/bin/controluser
36
 cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel-user > /usr/local/bin/controluser
37
+cat /tmp/includescripts /usr/local/bin/freedombone-addremove > /usr/local/bin/addremove
37
 
38
 
38
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/control
39
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/control
39
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/controluser
40
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/controluser
41
+sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/addremove
40
 
42
 
41
 chmod +x /usr/local/bin/control
43
 chmod +x /usr/local/bin/control
42
 chmod +x /usr/local/bin/controluser
44
 chmod +x /usr/local/bin/controluser
45
+chmod +x /usr/local/bin/addremove
43
 
46
 
44
 rm /tmp/includescripts
47
 rm /tmp/includescripts
45
 
48