general fixes

fourier_install.sh

@@ -11,6 +11,9 @@ tunnel_user=rtunnel
 datapath='/var/fourier'
 serverhost='monitor.audiovalid.com'
 tunnelfile="$programspath/ssh-tunnel.sh"
+mysql_user=fourier
+mysql_passwd='Sup3rDuper!'
+mysql_db=fourier
 
 echo "Fourier installer $installer_version"
 echo "------------------------------------"
@@ -122,7 +125,7 @@ sudo npm install -g pm2
 if [[ "$OSTYPE" != darwin* ]]; then
 	sudo apt-get install -y libusb-1.0-0-dev
 	cd $programspath
-	git clone https://github.com/niofis/rtl-sdr.git
+	git clone https://git.miralo.xyz/AudioValid/rtl-sdr
 	cd $programspath/rtl-sdr
 	mkdir build
 	cd build
@@ -146,23 +149,19 @@ cd $programspath/fourier-alt
 nimble build
 
 [ ! -f "$configfile" ] && \
-	python $installerpath/configure.py \
-		   $installerpath/fourier-config.json \
-		   $configfile \
-		   -programs "$programspath" \
-		   -receivers $RECEIVERS_COUNT
+	sudo python $installerpath/configure.py \
+		   		$installerpath/fourier-config.json \
+		  		$configfile \
+		   		-programs "$programspath" \
+		   		-receivers $RECEIVERS_COUNT
 	
 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;"
-
+	sudo mysql -u root -e "create database $mysql_db;"
+	sudo mysql -u root -e "create user '$mysql_user'@'localhost' identified by '$mysql_passwd';"
+	sudo mysql -u root -e "grant all privileges on $mysql_db.* to '$mysql_user'@'localhost';flush privileges;"
 	cd ~
-	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-key.json https://gist.githubusercontent.com/niofis/7f8ced8fc878acf8c9b45d8db3bb5458/raw/
-	sudo mv Fourier-key.json /etc/Fourier-key.json
+	sudo mysql -u root -h localhost $mysql_db < $installerpath/fourier.sql
+	sudo mv $installerpath/fourier-key.json /etc/Fourier-key.json
 fi
 
 echo "****************************************************************************"

repokey.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2RFvzVFVVpx9DtSElfrzq+3u652tIpYHgtF1bR71opjsnhKhU//SJr47lNOn15rptEqI7dbveNYhzDvNAGTSrHDj0M5t4iFe4qfwEKmhRbsRlibAMcNP55v/WEITUuV+QukhjU/MZjcr5uBy1wHqWxh7GHgMy19/Bzn2wZ1vWmHImZwVOmO3oPFX4jU1scqo94Hk3TvKbeLW4LmXUfYVZAKz9gW0YP6qxFKUeckUCr6tzxrP/gOYVjtyzkMMzZNhUC6QPdwqay5o2zqy9GQL/oqZnsnv02Wn11n7VtLoF1allZxc4IdJhJ9xWjfyxoI+kXrQaF41QIZhPSiW2P56P fourier@miralo