Skip to main content
Sign in
Snippets Groups Projects
Commit bb6411ce authored by Richard Hartmann's avatar Richard Hartmann
Browse files

More quoting and temporary removal of `vcsh exit`

parent da296ac1
No related branches found
No related tags found
No related merge requests found
#compdef vcsh #compdef vcsh
# use\:"use/enter repo" # use\:"use/enter repo"
# exit\:"exit repo"
_arguments \ _arguments \
':subcommand:(( ':subcommand:((
help\:"display help" help\:"display help"
...@@ -8,5 +9,4 @@ _arguments \ ...@@ -8,5 +9,4 @@ _arguments \
run\:"run command on repo" run\:"run command on repo"
init\:"init & clone from repo" init\:"init & clone from repo"
clone\:"clone from repo" clone\:"clone from repo"
exit\:"exit repo"
))' ))'
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
SELF=$(basename $0) SELF=$(basename $0)
[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config" [ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
for check_directory in $XDG_CONFIG_HOME $XDG_CONFIG_HOME/vcsh $XDG_CONFIG_HOME/vcsh/repo.d for check_directory in "$XDG_CONFIG_HOME" "$XDG_CONFIG_HOME/vcsh" "$XDG_CONFIG_HOME/vcsh/repo.d"
do do
if [ ! -d "$check_directory" ]; then if [ ! -d "$check_directory" ]; then
if [ -e "$check_directory" ]; then if [ -e "$check_directory" ]; then
echo "$SELF: error: $check_directory exists but is not a directory" >&2 echo "$SELF: error: $check_directory exists but is not a directory" >&2
exit 2 exit 2
else else
mkdir $check_directory || (echo "$SELF: error: could not create $check_directory" >&2; exit 2) mkdir "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
fi fi
fi fi
done done
...@@ -28,6 +28,8 @@ verbose() { ...@@ -28,6 +28,8 @@ verbose() {
} }
# use <repo> Use this repository # use <repo> Use this repository
#
# exit Exit vcsh mode" >&2
help() { help() {
echo "usage: $SELF <args> echo "usage: $SELF <args>
...@@ -41,8 +43,6 @@ help() { ...@@ -41,8 +43,6 @@ help() {
init <repo> Initialize a new repository init <repo> Initialize a new repository
clone <remote> \\ clone <remote> \\
[<repo>] Clone from an existing repository [<repo>] Clone from an existing repository
exit Exit vcsh mode" >&2
} }
use() { use() {
...@@ -67,13 +67,13 @@ init() { ...@@ -67,13 +67,13 @@ init() {
echo "$SELF: fatal: $GIT_DIR exists" && echo "$SELF: fatal: $GIT_DIR exists" &&
return 21 return 21
export GIT_WORK_TREE="$HOME" export GIT_WORK_TREE="$HOME"
mkdir -p $GIT_WORK_TREE mkdir -p "$GIT_WORK_TREE"
cd $GIT_WORK_TREE || cd "$GIT_WORK_TREE" ||
(echo "$SELF: fatal: could not enter $GIT_WORK_TREE" && (echo "$SELF: fatal: could not enter $GIT_WORK_TREE" &&
exit 20) || exit 20 exit 20) || exit 20
cd $GIT_WORK_TREE cd "$GIT_WORK_TREE"
git init git init
git config core.worktree $GIT_WORK_TREE git config core.worktree "$GIT_WORK_TREE"
verbose "init() end" verbose "init() end"
} }
...@@ -90,15 +90,15 @@ if [ "$1" = 'help' ] || [ "$#" -eq 0 ]; then ...@@ -90,15 +90,15 @@ if [ "$1" = 'help' ] || [ "$#" -eq 0 ]; then
elif [ "$1" = 'list' ]; then elif [ "$1" = 'list' ]; then
verbose "list begin" verbose "list begin"
for i in $VCSH_BASE/*.git; do for i in "$VCSH_BASE"/*.git; do
echo $(basename $i .git) echo $(basename "$i" .git)
done done
verbose "list end" verbose "list end"
exit 0 exit 0
elif [ "$1" = 'run' ]; then elif [ "$1" = 'run' ]; then
verbose "run begin" verbose "run begin"
use $2 use "$2"
shift 2 shift 2
"$@" "$@"
leave leave
...@@ -128,12 +128,12 @@ elif [ "$1" = 'clone' ]; then ...@@ -128,12 +128,12 @@ elif [ "$1" = 'clone' ]; then
verbose "clone begin" verbose "clone begin"
GIT_REMOTE="$2" GIT_REMOTE="$2"
REPO_NAME="$3" REPO_NAME="$3"
[ -z "$REPO_NAME" ] && REPO_NAME=$(basename $GIT_REMOTE .git) [ -z "$REPO_NAME" ] && REPO_NAME=$(basename "$GIT_REMOTE" .git)
export REPO_NAME export REPO_NAME
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init init
git remote add origin $GIT_REMOTE git remote add origin "$GIT_REMOTE"
git config branch.master.remote origin git config branch.master.remote origin
git config branch.master.merge refs/heads/master git config branch.master.merge refs/heads/master
git fetch git fetch
...@@ -155,19 +155,19 @@ elif [ "$1" = 'init' ]; then ...@@ -155,19 +155,19 @@ elif [ "$1" = 'init' ]; then
export REPO_NAME="$2" export REPO_NAME="$2"
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git" export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init init
# vcsh use $REPO_NAME # vcsh use "$REPO_NAME"
verbose "init end" verbose "init end"
elif [ "$1" = 'exit' ]; then #elif [ "$1" = 'exit' ]; then
verbose "exit begin" # verbose "exit begin"
if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then # if [ -n "$ZSH_VERSION" ] && [ "$VCSH_NO_IGNORE_EOF" = '1' ]; then
unset VCSH_NO_IGNORE_EOF # unset VCSH_NO_IGNORE_EOF
setopt NO_IGNORE_EOF # setopt NO_IGNORE_EOF
fi # fi
leave # leave
[ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1 # [ -n "$ZSH_VERSION" ] && [ "$USER" = richih ] && buildPS1
verbose "exit end" # verbose "exit end"
exit 0 # exit 0
else else
verbose "defaulting to calling help()" verbose "defaulting to calling help()"
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment