From: Carl Worth Date: Sun, 5 Jul 2020 18:09:08 +0000 (-0700) Subject: Add a NOGIT_DIR_TMP variable X-Git-Url: https://git.cworth.org/git?p=nogit;a=commitdiff_plain;h=9b145387ae0b95534b48ccf89080fc26d73e839c Add a NOGIT_DIR_TMP variable Rather than repeating the "-tmp" literally throughout the code. --- diff --git a/nogit b/nogit index 3b4c40c..16cd18f 100755 --- a/nogit +++ b/nogit @@ -2,6 +2,7 @@ set -e NOGIT_DIR=.nogit +NOGIT_DIR_TMP=$NOGIT_DIR-tmp usage_brief() { @@ -63,8 +64,8 @@ nogit_clone() fi # Clone the repository into a temporary directory - mkdir $NOGIT_DIR-tmp - cd $NOGIT_DIR-tmp + mkdir $NOGIT_DIR_TMP + cd $NOGIT_DIR_TMP git clone "$url" tmp >/dev/null 2>&1 # Sanity check that we won't be overwriting any files @@ -86,7 +87,7 @@ nogit_clone() echo "" >&2 echo "Cowardly refusing to clone" >&2 cd .. - rm -rf $NOGIT_DIR-tmp + rm -rf $NOGIT_DIR_TMP false fi @@ -95,7 +96,7 @@ nogit_clone() # checkout the (known to not be conflicting) files. mv tmp/.git ../$NOGIT_DIR cd .. - rm -rf $NOGIT_DIR-tmp + rm -rf $NOGIT_DIR_TMP GIT_DIR=$NOGIT_DIR git reset --hard >/dev/null 2>&1 echo "Completed nogit clone of $url"