소스 검색

More script replacements

Bob Mottram 8 년 전
부모
커밋
fe53a43e9f
6개의 변경된 파일14개의 추가작업 그리고 14개의 파일을 삭제
  1. 2
    2
      src/freedombone-image-mesh
  2. 2
    2
      src/freedombone-mesh
  3. 2
    2
      src/freedombone-mirrors
  4. 2
    2
      src/freedombone-remote
  5. 4
    4
      src/freedombone-restore-local
  6. 2
    2
      src/freedombone-restore-remote

+ 2
- 2
src/freedombone-image-mesh 파일 보기

373
 	echo $'Configuring toxcore' >> $INSTALL_LOG
373
 	echo $'Configuring toxcore' >> $INSTALL_LOG
374
 
374
 
375
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
375
 	if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
376
-		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
376
+		TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
377
 	else
377
 	else
378
-		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
378
+		TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
379
 	fi
379
 	fi
380
 
380
 
381
 	echo $'Enabling toxcore daemon' >> $INSTALL_LOG
381
 	echo $'Enabling toxcore daemon' >> $INSTALL_LOG

+ 2
- 2
src/freedombone-mesh 파일 보기

37
 
37
 
38
 MUMBLE_PATH=/usr/bin/mumble
38
 MUMBLE_PATH=/usr/bin/mumble
39
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
39
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
40
-    TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
40
+    TOXIC_FILE=$(cat /usr/local/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
41
 else
41
 else
42
-    TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
42
+    TOXIC_FILE=$(cat /usr/bin/${PROJECT_NAME}-app-tox | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
43
 fi
43
 fi
44
 DHTNODES=/usr/share/toxic/DHTnodes
44
 DHTNODES=/usr/share/toxic/DHTnodes
45
 
45
 

+ 2
- 2
src/freedombone-mirrors 파일 보기

36
 # Minimum number of characters in a password
36
 # Minimum number of characters in a password
37
 MINIMUM_PASSWORD_LENGTH=10
37
 MINIMUM_PASSWORD_LENGTH=10
38
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
38
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
39
-	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
39
+	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
40
 else
40
 else
41
 	if [ -f /usr/bin/${PROJECT_NAME} ]; then
41
 	if [ -f /usr/bin/${PROJECT_NAME} ]; then
42
-		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
42
+		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
43
 	fi
43
 	fi
44
 fi
44
 fi
45
 
45
 

+ 2
- 2
src/freedombone-remote 파일 보기

46
 # Minimum password length in characters
46
 # Minimum password length in characters
47
 MINIMUM_PASSWORD_LENGTH=10
47
 MINIMUM_PASSWORD_LENGTH=10
48
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
48
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
49
-	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
49
+	MINIMUM_PASSWORD_LENGTH=$(cat /usr/local/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
50
 else
50
 else
51
 	if [ -f /usr/bin/${PROJECT_NAME} ]; then
51
 	if [ -f /usr/bin/${PROJECT_NAME} ]; then
52
-		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME} | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
52
+		MINIMUM_PASSWORD_LENGTH=$(cat /usr/bin/${PROJECT_NAME}-utils-passwords | grep 'MINIMUM_PASSWORD_LENGTH=' | head -n 1 | awk -F '=' '{print $2}')
53
 	fi
53
 	fi
54
 fi
54
 fi
55
 
55
 

+ 4
- 4
src/freedombone-restore-local 파일 보기

51
 
51
 
52
 # get the version of Go being used
52
 # get the version of Go being used
53
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
53
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
54
-	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
55
-	GVM_HOME=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
54
+	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
55
+	GVM_HOME=$(cat /usr/local/bin/${PROJECT_NAME}-utils-go | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
56
 else
56
 else
57
-	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
58
-	GVM_HOME=$(cat /usr/bin/${PROJECT_NAME} | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
57
+	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
58
+	GVM_HOME=$(cat /usr/bin/${PROJECT_NAME}-utils-go | grep 'GVM_HOME=' | head -n 1 | awk -F '=' '{print $2}')
59
 fi
59
 fi
60
 
60
 
61
 ADMIN_USERNAME=
61
 ADMIN_USERNAME=

+ 2
- 2
src/freedombone-restore-remote 파일 보기

89
 
89
 
90
 # get the version of Go being used
90
 # get the version of Go being used
91
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
91
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
92
-	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
92
+	GO_VERSION=$(cat /usr/local/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
93
 else
93
 else
94
-	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME} | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
94
+	GO_VERSION=$(cat /usr/bin/${PROJECT_NAME}-utils-go | grep 'GO_VERSION=' | head -n 1 | awk -F '=' '{print $2}')
95
 fi
95
 fi
96
 
96
 
97
 # MariaDB password
97
 # MariaDB password