From 6bf34e3c22fe68207b9e0561f3bd76e715d507c8 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 20 Jun 2014 19:34:15 -0600 Subject: [PATCH] gitcreate: Differentiate repopath and repodir * repopath is the repository path provided by the user. Use $repopath instead of $1 for a clearer script. * repodir is the dirname of the repopath --- scripts/gitcreate | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/gitcreate b/scripts/gitcreate index c19839f..3c7cd36 100755 --- a/scripts/gitcreate +++ b/scripts/gitcreate @@ -24,16 +24,18 @@ if [ $# -ne 1 ]; then exit 1 fi -if [ -e $git_root/$1 ]; then - echo "$0: repository $1 already exists" >&2 +repopath=$1 + +if [ -e $git_root/$repopath ]; then + echo "$0: repository $repopath already exists" >&2 exit 1 fi # Do not create subdirectories without asking first -repopath=$(dirname $1) -if [ ! -d "$git_root/$repopath" ]; then +repodir=$(dirname $repopath) +if [ ! -d "$git_root/$repodir" ]; then if [ ! $yes ]; then - echo -n "Create git subdir '$repopath' (y/N)? " + echo -n "Create git subdir '$repodir' (y/N)? " read ans ans=$(expr "$ans" : '\(.\).*') # works with dash too if [ "$ans" != "y" -a "$ans" != "Y" ];then @@ -41,16 +43,16 @@ if [ ! -d "$git_root/$repopath" ]; then exit 0 fi fi - mkdir -p "$git_root/$repopath" 2>/dev/null - if [ ! -d "$git_root/$repopath" ]; then - echo "%0: repository not created, git subdir '$repopath' create failed" >&2 + mkdir -p "$git_root/$repodir" 2>/dev/null + if [ ! -d "$git_root/$repodir" ]; then + echo "%0: repository not created, git subdir '$repodir' create failed" >&2 exit 1 fi fi # Create the respository umask 027 -git --git-dir "$git_root/$1" init --bare +git --git-dir "$git_root/$repopath" init --bare [ $? -ne 0 ] && exit 1 [ -f "$gitacls" ] && echo "Check $gitacls for proper access permissions" -- 2.39.2