From c76a981674332abd7fbb78fb2862513e204fad7a Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 11 Jul 2019 16:47:08 +0000 Subject: [PATCH] added removal of temp file with sorted file list --- scripts/rev_control/diff_repos.sh | 2 ++ scripts/rev_control/push_repo_downstream.sh | 2 ++ scripts/rev_control/rcheckin.sh | 2 ++ scripts/rev_control/report_new.sh | 2 ++ scripts/rev_control/rgetem.sh | 2 ++ scripts/rev_control/rpuffer.sh | 2 ++ 6 files changed, 12 insertions(+) diff --git a/scripts/rev_control/diff_repos.sh b/scripts/rev_control/diff_repos.sh index 32a5d48c..5a6cf750 100644 --- a/scripts/rev_control/diff_repos.sh +++ b/scripts/rev_control/diff_repos.sh @@ -25,5 +25,7 @@ popd &>/dev/null perform_revctrl_action_on_file "$tempfile" do_revctrl_diff exit_on_error "performing revision control action do_revctrl_diff on: $tempfile" +rm "$tempfile" + restore_terminal_title diff --git a/scripts/rev_control/push_repo_downstream.sh b/scripts/rev_control/push_repo_downstream.sh index f12fc740..1fc6e0ba 100644 --- a/scripts/rev_control/push_repo_downstream.sh +++ b/scripts/rev_control/push_repo_downstream.sh @@ -53,6 +53,8 @@ exit_on_error "generating revision control file list" perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update exit_on_error "doing a careful update on: $tempfile" +rm "$tempfile" + # seems to be needed to cause a merge to be resolved. git pull downstream master # -m "unfortunate merge" diff --git a/scripts/rev_control/rcheckin.sh b/scripts/rev_control/rcheckin.sh index dc05cf47..185de49e 100644 --- a/scripts/rev_control/rcheckin.sh +++ b/scripts/rev_control/rcheckin.sh @@ -25,4 +25,6 @@ popd &>/dev/null perform_revctrl_action_on_file "$tempfile" do_revctrl_checkin exit_on_error "doing a check-in on: $tempfile" +rm "$tempfile" + restore_terminal_title diff --git a/scripts/rev_control/report_new.sh b/scripts/rev_control/report_new.sh index 5a057b0b..8ecb8715 100644 --- a/scripts/rev_control/report_new.sh +++ b/scripts/rev_control/report_new.sh @@ -26,5 +26,7 @@ popd &>/dev/null perform_revctrl_action_on_file "$tempfile" do_revctrl_report_new exit_on_error "running revision control report" +rm "$tempfile" + restore_terminal_title diff --git a/scripts/rev_control/rgetem.sh b/scripts/rev_control/rgetem.sh index 529fae19..11b9edd4 100644 --- a/scripts/rev_control/rgetem.sh +++ b/scripts/rev_control/rgetem.sh @@ -25,5 +25,7 @@ popd &>/dev/null perform_revctrl_action_on_file "$tempfile" do_revctrl_simple_update exit_on_error "running revision control update" +rm "$tempfile" + restore_terminal_title diff --git a/scripts/rev_control/rpuffer.sh b/scripts/rev_control/rpuffer.sh index ddf16337..d67332d3 100644 --- a/scripts/rev_control/rpuffer.sh +++ b/scripts/rev_control/rpuffer.sh @@ -29,5 +29,7 @@ popd &>/dev/null perform_revctrl_action_on_file "$tempfile" do_revctrl_careful_update exit_on_error "puffing out repository at: $tempfile" +rm "$tempfile" + restore_terminal_title -- 2.34.1