From: Chris Koeritz Date: Sun, 12 Nov 2017 05:56:43 +0000 (-0500) Subject: fixing naming X-Git-Tag: 2.140.98^2~4^2~23 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=2ab4ee7205d8e7d5d81e9a9764f13299444fdf68;p=feisty_meow.git fixing naming --- diff --git a/scripts/rev_control/rfluffer.sh b/scripts/rev_control/rfluffer.sh deleted file mode 100644 index b5de908e..00000000 --- a/scripts/rev_control/rfluffer.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# this "fluffs out" the repositories that it finds. what this means is that -# any git repositories found will have all of their remote state updated (by -# pulling all remote repos). this ensures that any upstream changes get -# merged into the local branch. -# it's better to fluff out your code regularly rather than waiting for a huge -# merge snarl later. note that if you check in the code frequently with the -# feisty meow scripts, that will also take care of fluffing out the code. - -source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" -source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" - -############## - -dir="$1"; shift -if [ -z "$dir" ]; then - dir=. -fi - -pushd "$dir" &>/dev/null -test_or_die "changing to directory: $dir" -tempfile=$(generate_rev_ctrl_filelist) -test_or_die "generating revision control file list" -popd &>/dev/null - -perform_revctrl_action_on_file "$tempfile" do_careful_git_update -test_or_die "fluffing out repository at: $tempfile" - diff --git a/scripts/rev_control/rpuffer.sh b/scripts/rev_control/rpuffer.sh new file mode 100644 index 00000000..5032bc12 --- /dev/null +++ b/scripts/rev_control/rpuffer.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +# this "puffs out" the repositories that it finds. what this means is that +# any git repositories found will have all of their remote state updated (by +# pulling all remote repos). this ensures that any upstream changes get +# merged into the local branch. +# it's better to puff out your code regularly rather than waiting for a huge +# merge snarl later. note that if you check in the code frequently with the +# feisty meow scripts, that will also take care of puffing out the code. + +source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh" +source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" + +############## + +dir="$1"; shift +if [ -z "$dir" ]; then + dir=. +fi + +pushd "$dir" &>/dev/null +test_or_die "changing to directory: $dir" +tempfile=$(generate_rev_ctrl_filelist) +test_or_die "generating revision control file list" +popd &>/dev/null + +perform_revctrl_action_on_file "$tempfile" do_careful_git_update +test_or_die "puffing out repository at: $tempfile" +