From: Fred T. Hamster Date: Thu, 9 Jan 2025 05:01:26 +0000 (-0500) Subject: changed to mainstream spelling for writable X-Git-Tag: 2.140.189^2~40 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a87cc7355138841171cd6e6171f1ce977041941a;p=feisty_meow.git changed to mainstream spelling for writable --- diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 9a1605d9..b1c7c903 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -948,14 +948,14 @@ return 0 } # makes sure that the provided "folder" is a directory and is writable. - function test_writeable() + function test_writable() { local folder="$1"; shift if [ ! -d "$folder" -o ! -w "$folder" ]; then return 1; fi return 0 } - # seek_writeable: + # seek_writable: # examines the provided "folder" name to test whether it is a directory # and is writable. zero (success) is returned if the folder is found. # if the folder is not found, and the second parameter passed is "up", @@ -971,7 +971,7 @@ return 0 # directory name to be sought in the current directory or above. but if the # folder has a full path with slashes, then the most basenamey directory # component is considered the directory to locate. - function seek_writeable() + function seek_writable() { #hmmm: ever any use to search downwards? sure there is. ==> currently not supported, but should be. local folder="$1"; shift diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index 2c4934f3..30f0c14f 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -74,7 +74,7 @@ function do_revctrl_checkin() pushd "$directory" &>/dev/null if [ -d "CVS" ]; then - if test_writeable "CVS"; then + if test_writable "CVS"; then do_revctrl_simple_update "$directory" exit_on_error "updating repository; this issue should be fixed before check-in." if [ -f "$NO_CHECKIN" ]; then @@ -87,7 +87,7 @@ function do_revctrl_checkin() fi fi elif [ -d ".svn" ]; then - if test_writeable ".svn"; then + if test_writable ".svn"; then do_revctrl_simple_update "$directory" exit_on_error "updating repository; this issue should be fixed before check-in." if [ -f "$NO_CHECKIN" ]; then @@ -99,10 +99,10 @@ function do_revctrl_checkin() exit_on_error "svn checkin" fi fi - elif [ ! -z "$(seek_writeable ".git" "up")" ]; then + elif [ ! -z "$(seek_writable ".git" "up")" ]; then #-d ".git" ]; then echo into git case. - topdir="$(seek_writeable ".git" "up")" + topdir="$(seek_writable ".git" "up")" echo "got topdir from seeking of '$topdir'" if [ ! -z "$topdir" ]; then @@ -417,21 +417,21 @@ function do_revctrl_simple_update() pushd "$directory" &>/dev/null if [ -d "CVS" ]; then - if test_writeable "CVS"; then + if test_writable "CVS"; then $blatt_report cvs update . | $TO_SPLITTER promote_pipe_return 0 exit_on_error "cvs update" fi elif [ -d ".svn" ]; then - if test_writeable ".svn"; then + if test_writable ".svn"; then $blatt_report svn update . | $TO_SPLITTER promote_pipe_return 0 exit_on_error "svn update" fi elif [ -d ".git" ]; then - if test_writeable ".git"; then + if test_writable ".git"; then $blatt_report git pull --tags 2>&1 | grep -v "X11 forwarding request failed" | $TO_SPLITTER promote_pipe_return 0