Bob Mottram 9 年 前
コミット
2b2ce8d78a
コミット者のEメールアドレスに関連付けられたアカウントが存在しません
共有2 個のファイルを変更した21 個の追加8 個の削除を含む
  1. 8
    8
      src/freedombone
  2. 13
    0
      src/freedombone-mesh

+ 8
- 8
src/freedombone ファイルの表示

487
 ENABLE_SOCIAL_KEY_MANAGEMENT="no"
487
 ENABLE_SOCIAL_KEY_MANAGEMENT="no"
488
 
488
 
489
 TOX_PORT=33445
489
 TOX_PORT=33445
490
-TOX_REPO="git://github.com/irungentoo/toxcore.git"
490
+TOXCORE_REPO="git://github.com/irungentoo/toxcore.git"
491
+TOXCORE_COMMIT='532629d486e3361c7d8d95b38293cc7d61dc4ee5'
491
 TOXID_REPO="https://github.com/bashrc/toxid"
492
 TOXID_REPO="https://github.com/bashrc/toxid"
492
-TOX_COMMIT='532629d486e3361c7d8d95b38293cc7d61dc4ee5'
493
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
493
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
494
 # These are some default nodes, but you can replace them with trusted nodes
494
 # These are some default nodes, but you can replace them with trusted nodes
495
 # as you prefer. See https://wiki.tox.im/Nodes
495
 # as you prefer. See https://wiki.tox.im/Nodes
1213
 		if grep -q "GOGS_COMMIT" $CONFIGURATION_FILE; then
1213
 		if grep -q "GOGS_COMMIT" $CONFIGURATION_FILE; then
1214
 			GOGS_COMMIT=$(grep "GOGS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1214
 			GOGS_COMMIT=$(grep "GOGS_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1215
 		fi
1215
 		fi
1216
-		if grep -q "TOX_COMMIT" $CONFIGURATION_FILE; then
1217
-			TOX_COMMIT=$(grep "TOX_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1216
+		if grep -q "TOXCORE_COMMIT" $CONFIGURATION_FILE; then
1217
+			TOXCORE_COMMIT=$(grep "TOXCORE_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1218
 		fi
1218
 		fi
1219
 		if grep -q "TOXIC_COMMIT" $CONFIGURATION_FILE; then
1219
 		if grep -q "TOXIC_COMMIT" $CONFIGURATION_FILE; then
1220
 			TOXIC_COMMIT=$(grep "TOXIC_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1220
 			TOXIC_COMMIT=$(grep "TOXIC_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1297
 		if grep -q "TOX_NODES" $CONFIGURATION_FILE; then
1297
 		if grep -q "TOX_NODES" $CONFIGURATION_FILE; then
1298
 			TOX_NODES=$(grep "TOX_NODES" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1298
 			TOX_NODES=$(grep "TOX_NODES" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1299
 		fi
1299
 		fi
1300
-		if grep -q "TOX_REPO" $CONFIGURATION_FILE; then
1301
-			TOX_REPO=$(grep "TOX_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1300
+		if grep -q "TOXCORE_REPO" $CONFIGURATION_FILE; then
1301
+			TOXCORE_REPO=$(grep "TOXCORE_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1302
 		fi
1302
 		fi
1303
 		if grep -q "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE; then
1303
 		if grep -q "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE; then
1304
 			ENABLE_SOCIAL_KEY_MANAGEMENT=$(grep "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1304
 			ENABLE_SOCIAL_KEY_MANAGEMENT=$(grep "ENABLE_SOCIAL_KEY_MANAGEMENT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
3080
 		return
3080
 		return
3081
 	fi
3081
 	fi
3082
 
3082
 
3083
-	${PROJECT_NAME}=mesh-install zeronet
3083
+	${PROJECT_NAME}-mesh-install zeronet
3084
 	systemctl daemon-reload
3084
 	systemctl daemon-reload
3085
 	systemctl start tracker.service
3085
 	systemctl start tracker.service
3086
 	systemctl start zeronet.service
3086
 	systemctl start zeronet.service
6858
 	fi
6858
 	fi
6859
 
6859
 
6860
 	# update to the next commit
6860
 	# update to the next commit
6861
-	set_repo_commit $INSTALL_DIR/toxcore "toxcore commit" "$TOX_COMMIT" $TOX_REPO
6861
+	set_repo_commit $INSTALL_DIR/toxcore "toxcore commit" "$TOXCORE_COMMIT" $TOXCORE_REPO
6862
 
6862
 
6863
 	if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
6863
 	if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
6864
 		return
6864
 		return

+ 13
- 0
src/freedombone-mesh ファイルの表示

33
 export TEXTDOMAIN=${PROJECT_NAME}-mesh
33
 export TEXTDOMAIN=${PROJECT_NAME}-mesh
34
 export TEXTDOMAINDIR="/usr/share/locale"
34
 export TEXTDOMAINDIR="/usr/share/locale"
35
 
35
 
36
+CONFIG_FILE=$HOME/${PROJECT_NAME}.cfg
37
+
36
 MUMBLE_PATH=/usr/bin/mumble
38
 MUMBLE_PATH=/usr/bin/mumble
37
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
39
 if [ -f /usr/local/bin/${PROJECT_NAME} ]; then
38
     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} | grep "TOXIC_FILE=" | head -n 1 | awk -F '=' '{print $2}')
45
 
47
 
46
 TOX_PORT=33445
48
 TOX_PORT=33445
47
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
49
 TOXCORE_REPO='git://github.com/irungentoo/toxcore.git'
50
+TOXCORE_COMMIT=
51
+# obtain tox values from main install
52
+if grep -q "TOX_PORT=" $CONFIG_FILE; then
53
+	TOX_PORT=$(cat $CONFIG_FILE | grep "TOX_PORT=" | nead -n 1 | awk -F '=' '{print $2}')
54
+fi
55
+if grep -q "TOXCORE_REPO=" $CONFIG_FILE; then
56
+	TOXCORE_REPO=$(cat $CONFIG_FILE | grep "TOXCORE_REPO=" | head -n 1 | awk -F '"' '{print $2}')
57
+fi
58
+if grep -q "TOXCORE_COMMIT=" $CONFIG_FILE; then
59
+	TOXCORE_COMMIT=$(cat $CONFIG_FILE | grep "TOXCORE_COMMIT=" | head -n 1 | awk -F "'" '{print $2}')
60
+fi
48
 TOXID_REPO='https://github.com/bashrc/toxid'
61
 TOXID_REPO='https://github.com/bashrc/toxid'
49
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
62
 TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
50
 QTOX_INI="/home/$USER/.config/tox/qtox.ini"
63
 QTOX_INI="/home/$USER/.config/tox/qtox.ini"