Przeglądaj źródła

fourier-config.json now is configured for ubuntu too

Gamaliel Espinoza 8 lat temu
rodzic
commit
00c9b17a4d
1 zmienionych plików z 3 dodań i 6 usunięć
  1. 3 6
      fourier_install.sh

+ 3 - 6
fourier_install.sh

@@ -149,14 +149,14 @@ nimble build
 #sudo mv fourier.service /etc/systemd/system/fourier.service
 #sudo systemctl enable fourier
 
-if [[ "$OSTYPE" == darwin* ]]; then
-	[ ! -f "$configfile" ] && \
+[ ! -f "$configfile" ] && \
 	python $installerpath/configure.py \
 		   $installerpath/fourier-config.json \
 		   $configfile \
 		   -programs "$programspath" \
 		   -receivers $RECEIVERS_COUNT
-else
+	
+if [[ "$OSTYPE" != darwin* ]]; then
 	sudo mysql -u root -e "create database fourier;"
 	sudo mysql -u root -e "create user 'fourier'@'localhost' identified by 'Sup3rDuper!';"
 	sudo mysql -u root -e "grant all privileges on fourier.* to 'fourier'@'localhost';flush privileges;"
@@ -165,9 +165,6 @@ else
 	curl -L -o fourier.sql https://gist.githubusercontent.com/niofis/cd843500ac96fe8ddc8f39a58a4afc55/raw/
 	sudo mysql -u root -h localhost fourier < fourier.sql
 
-	curl -L -o fourier-config.json https://gist.githubusercontent.com/niofis/0e95b950faa333909407b5a65270376d/raw/
-	sudo mv fourier-config.json /etc/fourier-config.json
-
 	curl -L -o Fourier-key.json https://gist.githubusercontent.com/niofis/7f8ced8fc878acf8c9b45d8db3bb5458/raw/
 	sudo mv Fourier-key.json /etc/Fourier-key.json
 fi