free
/
freedombone
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

More script replacements

Bob Mottram 8 years ago
parent
998274090f
commit
fe53a43e9f
6 changed files with 14 additions and 14 deletions
Split View Show Diff Stats
  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 View File 

@@ -373,9 +373,9 @@ function configure_toxcore {
373 373 
 	echo $'Configuring toxcore' >> $INSTALL_LOG
374 374
375 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 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 379 
 	fi
380 380
381 381 
 	echo $'Enabling toxcore daemon' >> $INSTALL_LOG

+ 2
- 2
src/freedombone-mesh View File 

@@ -37,9 +37,9 @@ CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
37 37
38 38 
 MUMBLE_PATH=/usr/bin/mumble
39 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 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 43 
 fi
44 44 
 DHTNODES=/usr/share/toxic/DHTnodes
45 45

+ 2
- 2
src/freedombone-mirrors View File 

@@ -36,10 +36,10 @@ export TEXTDOMAINDIR="/usr/share/locale"
36 36 
 # Minimum number of characters in a password
37 37 
 MINIMUM_PASSWORD_LENGTH=10
38 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 40 
 else
41 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 43 
 	fi
44 44 
 fi
45 45

+ 2
- 2
src/freedombone-remote View File 

@@ -46,10 +46,10 @@ FRIENDS_SERVERS_LIST=
46 46 
 # Minimum password length in characters
47 47 
 MINIMUM_PASSWORD_LENGTH=10
48 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 50 
 else
51 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 53 
 	fi
54 54 
 fi
55 55

+ 4
- 4
src/freedombone-restore-local View File 

@@ -51,11 +51,11 @@ fi
51 51
52 52 
 # get the version of Go being used
53 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 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 59 
 fi
60 60
61 61 
 ADMIN_USERNAME=

+ 2
- 2
src/freedombone-restore-remote View File 

@@ -89,9 +89,9 @@ fi
89 89
90 90 
 # get the version of Go being used
91 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 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 95 
 fi
96 96
97 97 
 # MariaDB password