Просмотр исходного кода

Supress curl error message and add user confirmation for upgrade.

Raphael Schneeberger 5 лет назад
Родитель
Сommit
c6ccdc5d0e
1 измененных файлов с 8 добавлено и 3 удалено
  1. 8 3
      bin/v-update-sys-hestia-git

+ 8 - 3
bin/v-update-sys-hestia-git

@@ -102,6 +102,13 @@ if [ -z "$branch" ]; then
     exit
 fi
 
+# Ask the user for a final confirmation
+read -p 'The update to a development branch should only be performed on test systems, as this can lead to instabilities and problems. Continue with the installation? [Y/N]: ' answer
+if [ "$answer" != 'y' ] && [ "$answer" != 'Y'  ]; then
+    echo 'Goodbye'
+    exit 1
+fi
+
 # Install needed software
 echo "Updating system APT repositories..."
 apt-get -qq update > /dev/null 2>&1
@@ -109,9 +116,7 @@ echo "Installing dependencies for compilation..."
 apt-get -qq install -y $SOFTWARE > /dev/null 2>&1
 
 # Fix for Debian PHP Envroiment
-if [ ! -e /usr/local/include/curl ]; then
-    ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl
-fi
+ln -s /usr/include/x86_64-linux-gnu/curl /usr/local/include/curl > /dev/null 2>&1
 
 # Get system cpu cores
 NUM_CPUS=$(grep "^cpu cores" /proc/cpuinfo | uniq |  awk '{print $4}')