Commit 065e6d35 authored by Vitaly Lipatov's avatar Vitaly Lipatov

introduce get_gear_name and use it

parent e1c2530b
...@@ -28,7 +28,7 @@ mygetopts() ...@@ -28,7 +28,7 @@ mygetopts()
# if two or one param only, try detect # if two or one param only, try detect
if [ -z "$3" ] || [ -z "$2" ] ; then if [ -z "$3" ] || [ -z "$2" ] ; then
# TODO # TODO
PROJECTNAME=$(basename `get_root_git_dir`) PROJECTNAME=$(get_gear_name)
else else
PROJECTNAME=$1 PROJECTNAME=$1
shift shift
......
...@@ -19,7 +19,7 @@ if is_girar_name $1 ; then ...@@ -19,7 +19,7 @@ if is_girar_name $1 ; then
fi fi
# FIXME # FIXME
PROJECTNAME=$(basename `get_root_git_dir`) PROJECTNAME=$(get_gear_name)
echo "Create remote $PROJECTNAME repo in $GIRARHOST:" echo "Create remote $PROJECTNAME repo in $GIRARHOST:"
ssh $GIRARHOST git-init-db $PROJECTNAME.git ssh $GIRARHOST git-init-db $PROJECTNAME.git
......
...@@ -34,7 +34,7 @@ fi ...@@ -34,7 +34,7 @@ fi
# PROJECTNAME=$1 # PROJECTNAME=$1
# shift # shift
#else #else
PROJECTNAME=$(basename `get_root_git_dir`) PROJECTNAME=$(get_gear_name)
#fi #fi
CURRENTBRANCH=$(get_current_branch) CURRENTBRANCH=$(get_current_branch)
......
...@@ -97,6 +97,13 @@ is_gear() ...@@ -97,6 +97,13 @@ is_gear()
return 1 return 1
} }
# FIXME
get_gear_name()
{
basename `get_root_git_dir`
}
if [ "$UID" = "0" ] && [ -z "$ALLOW_ROOT_USER" ] ; then if [ "$UID" = "0" ] && [ -z "$ALLOW_ROOT_USER" ] ; then
fatal "It is strict recommended do not use these scripts as root" fatal "It is strict recommended do not use these scripts as root"
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment