use update-alternative slave to allow switching all execuatables in one shot

Author: yelkaramacsc

install-java.sh

@@ -182,20 +182,21 @@ fi
 # Run update-alternatives commands
 if (confirm "Run update-alternatives commands?"); then
     echo "Running update-alternatives..."
-    declare -a commands=($(ls -1 ${extracted_dirname}/bin))
+    cmd="update-alternatives --install /usr/bin/java java $extracted_dirname/bin/java 10000"
+    declare -a commands=($(ls -1 ${extracted_dirname}/bin | grep -v ^java$))
     for command in "${commands[@]}"; do
         command_path=$extracted_dirname/bin/$command
         if [[ -x $command_path ]]; then
-            update-alternatives --install "/usr/bin/$command" "$command" "$command_path" 10000
-            update-alternatives --set "$command" "$command_path"
+            cmd="$cmd --slave /usr/bin/$command $command $command_path"
         fi
     done
-
     lib_path=$extracted_dirname/jre/lib/amd64/libnpjp2.so
     if [[ -d "/usr/lib/mozilla/plugins/" ]] && [[ -f $lib_path ]]; then
-        update-alternatives --install "/usr/lib/mozilla/plugins/libjavaplugin.so" "mozilla-javaplugin.so" "$lib_path" 10000
-        update-alternatives --set "mozilla-javaplugin.so" "$lib_path"
+        cmd="$cmd --slave /usr/lib/mozilla/plugins/libjavaplugin.so mozilla-javaplugin.so $lib_path"
     fi
+    echo $cmd
+    exec $cmd 
+    update-alternatives --set java $extracted_dirname/bin/java
 fi
 
 # Create system preferences directory

uninstall-java.sh

@@ -79,18 +79,7 @@ fi
 # Run update-alternatives commands
 if (confirm "Run update-alternatives commands?"); then
     echo "Running update-alternatives..."
-    declare -a commands=($(ls -1 ${java_dist_dir}/bin))
-    for command in "${commands[@]}"; do
-        command_path="$java_dist_dir/bin/$command"
-        if [[ -x $command_path ]]; then
-            update-alternatives --remove "$command" "$command_path"
-        fi
-    done
-
-    lib_path="$java_dist_dir/jre/lib/amd64/libnpjp2.so"
-    if [[ -d "/usr/lib/mozilla/plugins/" ]] && [[ -f $lib_path ]]; then
-        update-alternatives --remove "mozilla-javaplugin.so" "$lib_path"
-    fi
+    update-alternatives --remove java ${java_dist_dir}/bin/java
 fi
 
 if (confirm "Remove directory '$java_dist_dir'?"); then