瀏覽代碼

Reading the project repo

Bob Mottram 8 年之前
父節點
當前提交
7bac22dbf7
共有 3 個檔案被更改,包括 11 行新增7 行删除
  1. 7
    0
      src/freedombone-image
  2. 1
    7
      src/freedombone-upgrade
  3. 3
    0
      src/freedombone-utils-setup

+ 7
- 0
src/freedombone-image 查看文件

35
 export TEXTDOMAIN=${PROJECT_NAME}-image
35
 export TEXTDOMAIN=${PROJECT_NAME}-image
36
 export TEXTDOMAINDIR="/usr/share/locale"
36
 export TEXTDOMAINDIR="/usr/share/locale"
37
 
37
 
38
+#get the project repo
38
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
39
 PROJECT_REPO="https://github.com/bashrc/${PROJECT_NAME}"
40
+UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
41
+for f in $UTILS_FILES
42
+do
43
+  source $f
44
+done
45
+read_config_param PROJECT_REPO
39
 
46
 
40
 # recommended RAM for virtual machines
47
 # recommended RAM for virtual machines
41
 VM_MEMORY='1G'
48
 VM_MEMORY='1G'

+ 1
- 7
src/freedombone-upgrade 查看文件

47
 do
47
 do
48
   source $f
48
   source $f
49
 done
49
 done
50
-
51
-if [ -f $CONFIGURATION_FILE ]; then
52
-    # read the location of the main project repo
53
-    if grep -q "PROJECT_REPO" $CONFIGURATION_FILE; then
54
-        PROJECT_REPO=$(grep "PROJECT_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
55
-    fi
56
-fi
50
+read_config_param PROJECT_REPO
57
 
51
 
58
 update-ca-certificates
52
 update-ca-certificates
59
 
53
 

+ 3
- 0
src/freedombone-utils-setup 查看文件

257
 }
257
 }
258
 
258
 
259
 function setup_utils {
259
 function setup_utils {
260
+    read_config_param "PROJECT_REPO"
261
+    write_config_param "PROJECT_REPO" "$PROJECT_REPO"
262
+
260
     function_check create_completion_file
263
     function_check create_completion_file
261
     create_completion_file
264
     create_completion_file
262
 
265