From: Fred T. Hamster <fred@gruntose.com>
Date: Sat, 4 Jan 2025 05:33:14 +0000 (-0500)
Subject: dropped weird escapes on rm
X-Git-Tag: 2.140.189^2~48
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=964214ca428549f7c9af29c426f7e0ee8e93e092;p=feisty_meow.git

dropped weird escapes on rm

the \rm construct was displeasing to our eyes and finally had to be removed.
all delete operations are now going through safedel, as far as i know.
---

diff --git a/production/example_apps/zippy_maps/scripts/clean_mapsdemo.sh b/production/example_apps/zippy_maps/scripts/clean_mapsdemo.sh
index afe3d426..914fc4d7 100644
--- a/production/example_apps/zippy_maps/scripts/clean_mapsdemo.sh
+++ b/production/example_apps/zippy_maps/scripts/clean_mapsdemo.sh
@@ -18,11 +18,11 @@ rpuffer . &>/dev/null
 if [ $? -ne 0 ]; then
   # it seems our old files are still conflicting this.
   if [ -f config/config_google.php ]; then
-    \rm -f config/config_google.php
+    rm -f config/config_google.php
     exit_on_error "removing old config for google"
   fi
   if [ -f config/app.php ]; then
-    \rm -f config/app.php
+    rm -f config/app.php
     exit_on_error "removing old config for app"
   fi
 
diff --git a/scripts/archival/search_arch.sh b/scripts/archival/search_arch.sh
index fe0735f2..0d55b2c7 100644
--- a/scripts/archival/search_arch.sh
+++ b/scripts/archival/search_arch.sh
@@ -36,6 +36,6 @@ while read input_text; do
   if [ $? -eq 0 ]; then echo ==== Found pattern in $input_text ====; fi
 done <"$TMPFILE"
 
-\rm -f "$TMPFILE"
+rm -f "$TMPFILE"
 
 
diff --git a/scripts/buildor/gffs_builders.sh b/scripts/buildor/gffs_builders.sh
index 170e9c83..850a59a9 100644
--- a/scripts/buildor/gffs_builders.sh
+++ b/scripts/buildor/gffs_builders.sh
@@ -30,7 +30,7 @@ function build_gffs()
   echo "Build starting at: $(date)"
 
   # clean up some things.
-  \rm -rf unit-test-reports
+  rm -rf unit-test-reports
 
   # build the trunk.
   ant -Dbuild.targetArch=64 build
diff --git a/scripts/buildor/refresh_gffs_build.sh b/scripts/buildor/refresh_gffs_build.sh
index b2027bcd..cff6a1c1 100644
--- a/scripts/buildor/refresh_gffs_build.sh
+++ b/scripts/buildor/refresh_gffs_build.sh
@@ -9,7 +9,7 @@ bash $GFFS_TOOLKIT_ROOT/library/zap_genesis_javas.sh
 export GFFS_LOGS="$HOME/.GenesisII"
 
 echo cleaning out the logs directory...
-\rm -f "$GFFS_LOGS"/*log*
+rm -f "$GFFS_LOGS"/*log*
 
 echo making a simple starting log file for container...
 if [ ! -d "$GFFS_LOGS" ]; then
diff --git a/scripts/buildor/seek_all_source.sh b/scripts/buildor/seek_all_source.sh
index 600138b3..92ce4984 100644
--- a/scripts/buildor/seek_all_source.sh
+++ b/scripts/buildor/seek_all_source.sh
@@ -19,7 +19,7 @@ if [ -z "$SOURCES_FOUND_LIST" ]; then
   export SOURCES_FOUND_LIST="$(mktemp "$TMP/zz_temp_find_srcs.XXXXXX")"
 fi
 # clean up the file to start with.
-\rm $SOURCES_FOUND_LIST &>/dev/null
+rm $SOURCES_FOUND_LIST &>/dev/null
 
 for i in $find_src_parms; do
 #echo current dir is $i
diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index bcf50df6..012e54d6 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -166,7 +166,7 @@ if [ -z "$skip_all" ]; then
         local tmpfile="$(mktemp $TMP/aliasout.XXXXXX)"
         alias $varname | sed -e 's/.*=//' >$tmpfile
         echo "alias $varname=$(cat $tmpfile)"
-        \rm $tmpfile
+        rm $tmpfile
       elif [ -z "${!varname}" ]; then
         echo "$varname undefined"
       else
@@ -632,7 +632,7 @@ we will skip recustomization, but these other customizations are available:
     pushd "$FEISTY_MEOW_LOADING_DOCK" &>/dev/null
     if [ -h custom ]; then
       # there's an existing link, so remove it.
-      \rm custom
+      rm custom
     fi
     # make sure we cleaned up the area before we re-link.
     if [ -h custom -o -d custom -o -f custom ]; then
@@ -975,7 +975,7 @@ return 0
 
     # make a temp file to write to before we move file into place in bind.
     local new_version="/tmp/$(basename ${filename}).bkup-${RANDOM}" 
-    \rm -f "$new_version"
+    rm -f "$new_version"
     exit_on_error "cleaning out new version of file from: $new_version"
 
     local line
diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index cdd28ea1..30430edf 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -42,8 +42,8 @@ if [ ! -d "$FEISTY_MEOW_APEX" ]; then
   # wipe out the offending variable(s).
   unset FEISTY_MEOW_SCRIPTS FEISTY_MEOW_APEX
   # clean out any unfortunate wrongness that may exist in our generated areas.
-  if [ -d "$FEISTY_MEOW_LOADING_DOCK" ]; then \rm -rf "$FEISTY_MEOW_LOADING_DOCK"; fi
-  if [ -d "$FEISTY_MEOW_GENERATED_STORE" ]; then \rm -rf "$FEISTY_MEOW_GENERATED_STORE"; fi
+  if [ -d "$FEISTY_MEOW_LOADING_DOCK" ]; then rm -rf "$FEISTY_MEOW_LOADING_DOCK"; fi
+  if [ -d "$FEISTY_MEOW_GENERATED_STORE" ]; then rm -rf "$FEISTY_MEOW_GENERATED_STORE"; fi
   # also wipe any values from the variables pointing at generated stuff.
   unset FEISTY_MEOW_LOADING_DOCK FEISTY_MEOW_GENERATED_STORE
   echo "
diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh
index 3491beb8..42538092 100644
--- a/scripts/core/reconfigure_feisty_meow.sh
+++ b/scripts/core/reconfigure_feisty_meow.sh
@@ -53,7 +53,7 @@ PERL5LIB=$PERLLIB
 #echo PERLLIB after modification is $PERLLIB
 
 # make toast out of generated files right away, but leave any custom scripts.
-\rm -f "$FEISTY_MEOW_LOADING_DOCK"/fmc_*
+rm -f "$FEISTY_MEOW_LOADING_DOCK"/fmc_*
 
 ## #no, old:
 ## if [ ! -d "$FEISTY_MEOW_LOADING_DOCK/custom" ]; then
diff --git a/scripts/files/squish_directories.sh b/scripts/files/squish_directories.sh
index 01c818ea..a9f3b0e8 100644
--- a/scripts/files/squish_directories.sh
+++ b/scripts/files/squish_directories.sh
@@ -22,7 +22,7 @@ if [ ${#dirs[@]} -eq 0 ]; then
   find $dir -mindepth 1 -maxdepth 1 -type d -exec echo "dirs+=(\"{}\");" ';' >$tempfile
   source "$tempfile"
 #echo dirs default to: ${dirs[@]}
-  \rm -f $tempfile
+  rm -f $tempfile
 fi
 
 # takes a directory name as an argument and sucks the directory
diff --git a/scripts/generator/jenkins_builder.sh b/scripts/generator/jenkins_builder.sh
index 8a65f240..255496db 100644
--- a/scripts/generator/jenkins_builder.sh
+++ b/scripts/generator/jenkins_builder.sh
@@ -15,7 +15,7 @@ fi
 
 export RUN_ALL_TESTS=true
 # clean up any old home storage paths.
-\rm -rf "$feisty_path/home_store".*
+rm -rf "$feisty_path/home_store".*
 # set home folder to a new home_store.random folder, for anything that
 # feisty meow needs to store under $HOME.
 export HOME="$(mktemp -d "$feisty_path/home_store.XXXXXX")"
diff --git a/scripts/generator/minimize_feisty_meow.sh b/scripts/generator/minimize_feisty_meow.sh
index d19076a7..b1e5470d 100644
--- a/scripts/generator/minimize_feisty_meow.sh
+++ b/scripts/generator/minimize_feisty_meow.sh
@@ -11,15 +11,15 @@ echo "Cleaning up feisty meow generated files..."
 
 pushd $FEISTY_MEOW_GENERATED_STORE
 
-\rm -rf logs clam_tmp temporaries/*
+rm -rf logs clam_tmp temporaries/*
 
 pushd runtime
 
-\rm -rf install/*
+rm -rf install/*
 
 pushd binaries
 
-\rm -rf *.a *.library test_*
+rm -rf *.a *.library test_*
 
 popd
 popd
diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index b1aa88ec..e4294bfc 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -524,7 +524,7 @@ function generate_rev_ctrl_filelist()
   local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
   sort <"$tempfile" >"$sortfile"
   echo "$sortfile"
-  \rm "$tempfile"
+  rm "$tempfile"
 }
 
 # iterates across a list of directories contained in a file (first parameter).
diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh
index 98481c08..b6a28ae5 100644
--- a/scripts/site_avenger/shared_site_mgr.sh
+++ b/scripts/site_avenger/shared_site_mgr.sh
@@ -405,7 +405,7 @@ function composer_repuff()
       echo "** FAILED: Database migrations for avcore.  Check log file in: $logfile"
       # we keep going, because some sites aren't ready for this yet.
     else
-      \rm "$logfile"
+      rm "$logfile"
       echo "Database for avcore migrated."
     fi
   fi
@@ -465,12 +465,12 @@ function create_site_links()
     # link 'public' to webroot.
     if [ -L public ]; then
       # public is a symlink.
-      \rm public
+      rm public
       exit_on_error "Removing public directory symlink"
     elif [ -d public ]; then
       # public is a folder with default files.
 #hmmm: is that safe?
-      \rm -rf public
+      rm -rf public
       exit_on_error "Removing public directory and contents"
     fi
 
diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 1213bdc9..d4cc328f 100644
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -304,7 +304,7 @@ function disable_site()
     echo "Please consult the apache error logs for more details."
     exit 1
   fi
-  \rm "$outfile"
+  rm "$outfile"
 }
 
 # turns on the config file we create above for apache.
@@ -324,7 +324,7 @@ function enable_site()
     echo "Please consult the apache error logs for more details."
     exit 1
   fi
-  \rm "$outfile"
+  rm "$outfile"
 }
 
 # restarts the apache2 service.
diff --git a/scripts/system/dump_log.sh b/scripts/system/dump_log.sh
index 14a2ffda..3b2be2f7 100644
--- a/scripts/system/dump_log.sh
+++ b/scripts/system/dump_log.sh
@@ -28,7 +28,7 @@ function assemble_log_file()
   done
 
   cat "$logdump"
-  \rm -f "$logdump"
+  rm -f "$logdump"
 }
 
 
diff --git a/scripts/testing/squelch_unless_error.sh b/scripts/testing/squelch_unless_error.sh
index f9fdf01b..d72adcab 100644
--- a/scripts/testing/squelch_unless_error.sh
+++ b/scripts/testing/squelch_unless_error.sh
@@ -30,7 +30,7 @@ if [ $retval != 0 ]; then
 fi
 
 # clean up.
-\rm "$newout" "$newerr"
+rm "$newout" "$newerr"
 
 # pass along the error code we saw, whether success or failure, so that this command has same
 # exit result as the original would have.
diff --git a/scripts/wine/remake_wine_links.sh b/scripts/wine/remake_wine_links.sh
index 012f636d..de623e6b 100644
--- a/scripts/wine/remake_wine_links.sh
+++ b/scripts/wine/remake_wine_links.sh
@@ -13,7 +13,7 @@ if [ ! -L "My Documents" -o ! -L "Desktop" ]; then
   exit 1
 fi
 
-\rm "Desktop" "My Documents" "My Pictures" "My Videos" "My Music"
+rm "Desktop" "My Documents" "My Pictures" "My Videos" "My Music"
 
 if [ ! -d ~/linx/wine_goods ]; then
   mkdir ~/linx/wine_goods
diff --git a/testkit/library/helper_methods.sh b/testkit/library/helper_methods.sh
index 6b0329ae..27449b38 100644
--- a/testkit/library/helper_methods.sh
+++ b/testkit/library/helper_methods.sh
@@ -45,7 +45,7 @@ function readable_date_string()
         local tmpfile="$(mktemp $TMP/aliasout.XXXXXX)"
         alias $varname | sed -e 's/.*=//' >$tmpfile
         echo "alias $varname=$(cat $tmpfile)"
-        \rm $tmpfile
+        rm $tmpfile
       elif [ -z "${!varname}" ]; then
         echo "$varname undefined"
       else
@@ -135,7 +135,7 @@ function run_any_command()
   cat "$my_output" >> "$CONGLOMERATED_TESTKIT_OUTPUT"
   echo "=======" >> "$CONGLOMERATED_TESTKIT_OUTPUT"
   # and now remove the tiny individual log file so we don't litter.
-  \rm -f "$my_output"
+  rm -f "$my_output"
   return $retval
 }
 
diff --git a/testkit/test_driver.sh b/testkit/test_driver.sh
index 50193b26..1db37e58 100755
--- a/testkit/test_driver.sh
+++ b/testkit/test_driver.sh
@@ -44,7 +44,7 @@ fi
 ##############
 
 # clean up any conglomerated log file.
-\rm -f "$CONGLOMERATED_TESTKIT_OUTPUT"
+rm -f "$CONGLOMERATED_TESTKIT_OUTPUT"
 
 ##############