From: Chris Koeritz Date: Sun, 7 Jan 2018 19:36:01 +0000 (-0500) Subject: cleaned debugging noise, better naming X-Git-Tag: 2.140.107^2~2^2 X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=a750a9006479ee6473edcd539b325ced1ab1180e cleaned debugging noise, better naming --- diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index ff2f7bed..8ec547f3 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -16,8 +16,6 @@ source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh" # feature appeared in git 2.6 and xenial claims it has git version 2.7.4. eventually, # this version test can go away. gitvertest="$(git version | sed -e 's/git version [0-9]\.//' | sed -e 's/\.[0-9][0-9]*$//' )" -#hmmm: temp below! -echo gitvertest is $gitvertest if (( $gitvertest >= 11 )); then # auto-stash is not available until 2.6 for git, but ubuntu is misreporting or using a # differing version number somehow. we are sure autostash was missing on ubuntu xenial diff --git a/scripts/site_avenger/shared_site_mgr.sh b/scripts/site_avenger/shared_site_mgr.sh index a82ae98d..94a4f792 100644 --- a/scripts/site_avenger/shared_site_mgr.sh +++ b/scripts/site_avenger/shared_site_mgr.sh @@ -354,7 +354,7 @@ function update_composer_repository() # fixes the ownership for a site avenger or php application. # this almost certainly will require sudo capability, if there are any ownership problems # that need to be resolved. -function fix_ownership() +function fix_appdir_ownership() { local appsdir="$1"; shift local dir="$1"; shift diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh index a9b1a91b..cd2f6890 100644 --- a/scripts/site_avenger/standup.sh +++ b/scripts/site_avenger/standup.sh @@ -94,7 +94,7 @@ sep # hmmm: pass the real user name who should own the files? # hmmm: "$(logname)" $USER works, but logname wasn't? -fix_ownership "$BASE_APPLICATION_PATH" "$APPLICATION_NAME" +fix_appdir_ownership "$BASE_APPLICATION_PATH" "$APPLICATION_NAME" sep