Add a non-interactive install of dircolors

--install-dircolors to install dircolors without any question
--skip-dircolors will skip the dircolors install

Also valid for set_{dark,light}.sh

Author: aruhier

install.sh

@@ -18,6 +18,8 @@ show_help() {
   echo "    Color scheme to be used (will be asked otherwise)"
   echo "  -p profile, --profile profile, --profile profile"
   echo "    Gnome Terminal profile to overwrite (will be asked otherwise)"
+  echo "  --install-dircolors, --skip-dircolors"
+  echo "    Do or skip the dircolors installation in a non interactive mode"
 }
 
 validate_scheme() {
@@ -145,6 +147,12 @@ do
       profile=$2
       shift
     ;;
+    --install-dircolors )
+      install_dircolors=true
+    ;;
+    --skip-dircolors )
+      install_dircolors=false
+    ;;
   esac
   shift
 done
@@ -174,4 +182,11 @@ else
 fi
 
 set_profile_colors $profile $scheme
-check_dircolors || warning_message_dircolors
+
+if [ -n "$install_dircolors" ]
+    then if "$install_dircolors"
+        then copy_dircolors
+    fi
+else
+    check_dircolors || warning_message_dircolors
+fi

set_dark.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 dir=`dirname "$0"`
-source $dir/src/set_theme_default_profile.sh dark $1
+source $dir/src/set_theme_default_profile.sh dark $*

set_light.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 dir=`dirname "$0"`
-source $dir/src/set_theme_default_profile.sh light $1
+source $dir/src/set_theme_default_profile.sh light $*

src/dircolors.sh

@@ -20,21 +20,19 @@ dl_dircolors() {
   return 0
 }
 
-copy_dicolors() {
-  if [ "$1" != 1 ]
-    then return
-  else
-    eval dl_dircolors
-    dl_ok=$?
-    if [ $dl_ok ]
-      then if [ -f "$DIRCOLORS_DIR/dircolors" ]
-        then mv "$DIRCOLORS_DIR/dircolors" "$DIRCOLORS_DIR/dircolors.old"
-        echo -e "$DIRCOLORS_DIR/dircolors already exists, renaming it to"
-        echo "dircolors.old"
-      fi
+copy_dircolors() {
+  eval dl_dircolors
+  dl_ok=$?
+  if [ $dl_ok ]
+    then if [ -f "$DIRCOLORS_DIR/dircolors" ]
+      then mv "$DIRCOLORS_DIR/dircolors" "$DIRCOLORS_DIR/dircolors.old"
+      echo -e "$DIRCOLORS_DIR/dircolors already exists, renaming it to"
+      echo "dircolors.old"
     fi
   fi
+
   cp "$DIRCOLORS_SOLARIZED/dircolors" "$DIRCOLORS_DIR/dircolors"
+
   echo
   echo "The new dircolors have been installed to $DIRCOLORS_DIR/dircolors."
   echo
@@ -89,15 +87,18 @@ interactive_dircolors() {
     read -p "Enter your choice : [2] " selection
     selection=${selection:-2}
 
-    if [ "$selection" -gt 2 -o "$selection" -lt 1 ]
+    if [[ "$selection" -gt 2 || "$selection" -lt 1 ]]
       then echo "$selection is not a valid entry. Please Restart"
       echo
       noselect=true
     else
       noselect=false
     fi
   done
-  copy_dicolors $selection
+
+  if [ "$selection" == 1 ]
+    then copy_dircolors
+  fi
 }
 
 check_dircolors() {

src/set_theme_default_profile.sh

@@ -16,5 +16,7 @@ get_default_profile() {
   echo $profile_name
 }
 
+SCHEME=$1
 PROFILE=${2:-"$(get_default_profile)"}
-$dir/install.sh -s $1 -p "$PROFILE"
+shift; shift
+$dir/install.sh -s "$SCHEME" -p "$PROFILE" $*