From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 03:56:30 +0000 (-0500)
Subject: Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev
X-Git-Tag: 2.140.98^2~28^2~2
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=717d18a858cb01b944ae470a6af31a86b038b5a5;hp=491bfd133c33e140bfb93ac47656bf429af42e2e;p=feisty_meow.git

Merge branch 'dev' of git://feistymeow.org/feisty_meow into dev

pulling fix for version control generated list file
---

diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh
index 1d8b5608..8c7e9961 100644
--- a/scripts/rev_control/version_control.sh
+++ b/scripts/rev_control/version_control.sh
@@ -445,7 +445,7 @@ function generate_rev_ctrl_filelist()
   local sortfile=$(mktemp /tmp/zz_checkin_sort.XXXXXX)
   sort <"$tempfile" >"$sortfile"
   echo "$sortfile"
-  \rm "$tempfile" "$sortfile"
+  \rm "$tempfile"
 }
 
 # iterates across a list of directories contained in a file (first parameter).
@@ -480,6 +480,6 @@ function perform_revctrl_action_on_file()
 
   restore_terminal_title
 
-  rm $tempfile
+  rm "$tempfile"
 }