nice, first bit of auto-help

[feisty_meow.git] / scripts / core / functions.sh

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 6c8bc68ad64e13b805ad1fc326f536558ae2b980..5c8f430eb9b109aa6b7f34a17e1200f5908574e3 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -121,15 +121,37 @@ if [ -z "$skip_all" ]; then
   # checks the result of the last command that was run, and if that failed,
   # then this complains and exits from bash.  the function parameters are
   # used as the message to print as a complaint.
-  function check_result()
+  function test_or_fail()
   {
     if [ $? -ne 0 ]; then
-      echo -e "failed on: $*"
+      echo -e "\n\nfailed on: $*"
       error_sound
       exit 1
     fi
   }
 
+  # like test_or_fail, but will keep going after complaining.
+  function test_or_continue()
+  {
+    if [ $? -ne 0 ]; then
+      echo -e "\n\nfailed on: $*"
+      error_sound
+    fi
+  }
+
+  # wraps secure shell with some parameters we like, most importantly to enable X forwarding.
+  function ssh()
+  {
+    local args=($*)
+    save_terminal_title
+    # we remember the old terminal title, then force the TERM variable to a more generic
+    # version for the other side (just 'linux'); we don't want the remote side still
+    # thinking it's running xterm.
+    export TERM=linux
+    /usr/bin/ssh -X -C "${args[@]}"
+    restore_terminal_title
+  }
+
   # locates a process given a search pattern to match in the process list.
   # supports a single command line flag style parameter of "-u USERNAME";
   # if the -u flag is found, a username is expected afterwards, and only the
@@ -410,18 +432,24 @@ if [ -z "$skip_all" ]; then
     regenerate >/dev/null
     pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null
     incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom")"
+
+    local fail_message="\nare the perl dependencies installed?  if you're on ubuntu or debian, try this:\n
+    $(grep "apt.*perl" $FEISTY_MEOW_APEX/readme.txt)\n"
     
     #echo "the incongruous files list is: $incongruous_files"
     # disallow a single character result, since we get "*" as result when nothing exists yet.
     if [ ${#incongruous_files} -ge 2 ]; then
       echo "cleaning unknown older overrides..."
       perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" $incongruous_files
+      test_or_continue "running safedel.  $fail_message" 
       echo
     fi
     popd &>/dev/null
     echo "copying custom overrides for $custom_user"
     mkdir -p "$FEISTY_MEOW_LOADING_DOCK/custom" 2>/dev/null
     perl "$FEISTY_MEOW_SCRIPTS/text/cpdiff.pl" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom"
+    test_or_continue "running cpdiff.  $fail_message"
+
     if [ -d "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" ]; then
       echo "copying custom scripts for $custom_user"
       \cp -R "$FEISTY_MEOW_SCRIPTS/customize/$custom_user/scripts" "$FEISTY_MEOW_LOADING_DOCK/custom/"
@@ -645,26 +673,6 @@ alias "${@}"
 return 0
   }
 
-  # defines a variable within the feisty meow environment and remembers that
-  # this is a new or modified definition.  if the feisty meow codebase is
-  # unloaded, then so are all the variables that were defined.
-  # this function always exports the variables it defines.
-#  function define_yeti_variable()
-#  {
-## if variable exists already, save old value for restore,
-## otherwise save null value for restore,
-## have to handle unsetting if there was no prior value of one
-## we newly defined.
-## add variable name to a list of feisty defined variables.
-#
-##hmmm: first implem just sets it up and exports the variable.
-##  i.e., this method always exports.
-#export "${@}" 
-#
-#
-#return 0
-#  }
-
   ##############
 
 #hmmm: this points to an extended functions file being needed; not all of these are core.
@@ -728,7 +736,7 @@ return 0
   
     if [ -d "$src" ]; then
       ln -s "$src" "$target"
-      check_result "Creating symlink from '$src' to '$target'"
+      test_or_fail "Creating symlink from '$src' to '$target'"
     fi
     echo "Created symlink from '$src' to '$target'."
   }
@@ -752,7 +760,7 @@ return 0
     echo running tests on set_var_if_undefined.
     flagrant=petunia
     set_var_if_undefined flagrant forknordle
-    check_result "testing if defined variable would be whacked"
+    test_or_fail "testing if defined variable would be whacked"
     if [ $flagrant != petunia ]; then
       echo set_var_if_undefined failed to leave the test variable alone
       exit 1