ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-16' into 'dev' 

ubuntu.sh : Use double quotes to prevent globbing and word splitting. Use "read -r" for correctness

See merge request Shinobi-Systems/Shinobi!164
revert-b25c0d81
Moe 2020-02-07 19:57:14 +00:00
parent 8e21f87169 265fb78825
commit 4d846e3c95
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
INSTALL/ubuntu.sh
View File

@ -73,11 +73,11 @@ fi
echo "=============" echo "============="
echo "Shinobi - Do you want to Install MariaDB? Choose No if you already have it." echo "Shinobi - Do you want to Install MariaDB? Choose No if you already have it."
echo "(y)es or (N)o" echo "(y)es or (N)o"
read mysqlagree read -r mysqlagree
if [ "$mysqlagree" = "y" ] || [ "$mysqlagree" = "Y" ]; then if [ "$mysqlagree" = "y" ] || [ "$mysqlagree" = "Y" ]; then
echo "Shinobi - Installing MariaDB" echo "Shinobi - Installing MariaDB"
echo "Password for root SQL user, If you are installing SQL now then you may put anything:" echo "Password for root SQL user, If you are installing SQL now then you may put anything:"
read sqlpass read -r sqlpass
echo "mariadb-server mariadb-server/root_password password $sqlpass" | debconf-set-selections echo "mariadb-server mariadb-server/root_password password $sqlpass" | debconf-set-selections
echo "mariadb-server mariadb-server/root_password_again password $sqlpass" | debconf-set-selections echo "mariadb-server mariadb-server/root_password_again password $sqlpass" | debconf-set-selections
sudo apt install mariadb-server -y sudo apt install mariadb-server -y
@ -86,19 +86,19 @@ fi
echo "=============" echo "============="
echo "Shinobi - Database Installation" echo "Shinobi - Database Installation"
echo "(y)es or (N)o" echo "(y)es or (N)o"
read mysqlagreeData read -r mysqlagreeData
if [ "$mysqlagreeData" = "y" ] || [ "$mysqlagreeData" = "Y" ]; then if [ "$mysqlagreeData" = "y" ] || [ "$mysqlagreeData" = "Y" ]; then
if [ "$mysqlagree" = "y" ] || [ "$mysqlagree" = "Y" ]; then if [ "$mysqlagree" = "y" ] || [ "$mysqlagree" = "Y" ]; then
sqluser="root" sqluser="root"
fi fi
if [ ! "$mysqlagree" = "y" ]; then if [ ! "$mysqlagree" = "y" ]; then
echo "What is your SQL Username?" echo "What is your SQL Username?"
read sqluser read -r sqluser
echo "What is your SQL Password?" echo "What is your SQL Password?"
read sqlpass read -r sqlpass
fi fi
sudo mysql -u $sqluser -p$sqlpass -e "source sql/user.sql" || true sudo mysql -u "$sqluser" -p"$sqlpass" -e "source sql/user.sql" || true
sudo mysql -u $sqluser -p$sqlpass -e "source sql/framework.sql" || true sudo mysql -u "$sqluser" -p"$sqlpass" -e "source sql/framework.sql" || true
fi fi
echo "=============" echo "============="
echo "Shinobi - Install NPM Libraries" echo "Shinobi - Install NPM Libraries"
@ -117,7 +117,7 @@ echo "Shinobi - Randomizing cron key"
node /home/Shinobi/tools/modifyConfiguration.js addToConfig="{\"cron\":{\"key\":\"$(head -c 64 < /dev/urandom | sha256sum | awk '{print substr($1,1,60)}')\"}}" node /home/Shinobi/tools/modifyConfiguration.js addToConfig="{\"cron\":{\"key\":\"$(head -c 64 < /dev/urandom | sha256sum | awk '{print substr($1,1,60)}')\"}}"
echo "Shinobi - Start Shinobi and set to start on boot?" echo "Shinobi - Start Shinobi and set to start on boot?"
echo "(y)es or (N)o" echo "(y)es or (N)o"
read startShinobi read -r startShinobi
if [ "$startShinobi" = "y" ] || [ "$startShinobi" = "y" ]; then if [ "$startShinobi" = "y" ] || [ "$startShinobi" = "y" ]; then
sudo pm2 start camera.js sudo pm2 start camera.js
sudo pm2 start cron.js sudo pm2 start cron.js