Install_deps.sh: ask suse users whether they want to install packman or not (can...
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 20 Jun 2013 19:19:11 +0000 (19:19 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 20 Jun 2013 19:19:11 +0000 (19:19 +0000)
build_files/build_environment/install_deps.sh

index fbd4c2f46d7a775656df42d989acda7fd945881e..514e9f4ee5818b1f1ece5c0ab040d8ab1e0851ce 100755 (executable)
@@ -1550,7 +1550,7 @@ compile_OSL() {
       tar -C $SRC --transform "s,(.*/?)OpenShadingLanguage-[^/]*(.*),\1OpenShadingLanguage-$OSL_VERSION\2,x" \
           -xf $_src.tar.gz
       cd $_src
-      git checkout blender-fixes
+      #git checkout blender-fixes
       cd $CWD
     fi
 
@@ -2278,8 +2278,18 @@ install_RPM() {
     fi
 
     _suse_rel="`grep VERSION /etc/SuSE-release | gawk '{print $3}'`"
-    sudo zypper ar -f http://packman.inode.at/suse/openSUSE_$_suse_rel/ packman
 
+    INFO ""
+    INFO "About to add 'packman' repository from http://packman.inode.at/suse/openSUSE_$_suse_rel/"
+    INFO "This is only needed if you do not already have a packman repository enabled..."
+    read -p "Do you want to add this repo (Y/n)?"
+    if [ "$(echo ${REPLY:=Y} | tr [:upper:] [:lower:])" == "y" ]; then
+      INFO "    Installing packman..."
+      sudo zypper ar -f http://packman.inode.at/suse/openSUSE_$_suse_rel/ packman
+      INFO "    Done."
+    else
+      INFO "    Skipping packman installation."
+    fi
     sudo zypper --non-interactive --gpg-auto-import-keys update --auto-agree-with-licenses
   fi