Pārlūkot izejas kodu

Removed automatic device id generation

Gamaliel Espinoza 7 gadi atpakaļ
vecāks
revīzija
bd9d8f7506
2 mainītis faili ar 5 papildinājumiem un 2 dzēšanām
  1. 2 1
      configure.py
  2. 3 1
      fourier_install.sh

+ 2 - 1
configure.py

@@ -7,7 +7,6 @@ import base64
 import argparse
 
 b64id = base64.b64encode(os.urandom(9))
-theid = ''.join([c for c in b64id if c.isalnum()])
 
 parser = argparse.ArgumentParser()
 parser.add_argument('src', nargs=1)
@@ -15,8 +14,10 @@ parser.add_argument('dst', nargs=1)
 parser.add_argument('-programs', dest='programspath')
 parser.add_argument('-receivers', dest='receivers', type=int)
 parser.add_argument('-api-secret', dest='api_secret')
+parser.add_argument('-box-id', dest='box_id')
 arg = parser.parse_args()
 
+theid = arg.box_id
 infile = arg.src
 outfile = arg.dst
 

+ 3 - 1
fourier_install.sh

@@ -31,6 +31,7 @@ clonerepo() {
 
 read -p "Whats this box port (last 3 numbers with zero for padding)? " PORT
 read -p "How many receivers has this box? " RECEIVERS_COUNT
+read -p "Box ID (from API): " BOX_ID
 read -p "API secret: " API_SECRET
 
 findmnt /media/datadrive
@@ -175,7 +176,8 @@ nimble build
 		  		$configfile \
 		   		-programs "$programspath" \
 		   		-receivers $RECEIVERS_COUNT \
-		   		-api-secret $API_SECRET
+		   		-api-secret $API_SECRET \
+		   		-box-id "$BOX_ID"
 	
 if [[ "$OSTYPE" != darwin* ]]; then
 	sudo mysql -u root -e "create database $mysql_db;"