echo "$SELF: error: $check_directory exists but is not a directory" >&2
exit 2
else
- echo "$SELF: attempting to create $check_directory"
+ echo "$SELF: info: attempting to create $check_directory"
mkdir -p "$check_directory" || (echo "$SELF: error: could not create $check_directory" >&2; exit 2)
fi
fi
git init
git config core.worktree "$GIT_WORK_TREE"
git config core.excludesfile ".gitignore.d/$REPO_NAME"
+ touch "$HOME/.gitignore.d/$REPO_NAME"
+ git add "$HOME/.gitignore.d/$REPO_NAME"
verbose "init() end"
}
elif [ "$1" = 'init' ]; then
verbose "init begin"
- [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+ [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
export REPO_NAME="$2"
export GIT_DIR="$VCSH_BASE/$REPO_NAME.git"
init
elif [ "$1" = 'seed-gitignore' ]; then
verbose "seed-gitignore begin"
- [ -z $2 ] && help && echo && echo "$SELF $1: please specify repository to work on" && return 0
+ [ -z $2 ] && help && echo && echo "$SELF $1: error: please specify repository to work on" && return 0
use "$2"
+ # Switching directory as this has to be executed from $HOME to be of any use.
+ # Going back into old directory at the end in case `vcsh use` is reactivated.
+ old_dir="$PWD"
+ cd "$HOME"
git config core.excludesfile ".gitignore.d/$REPO_NAME"
- files=$(git ls-files)
gitignores=$(for file in $(git ls-files); do
while true; do
echo $file; new="${file%/*}"
file="$new"
done;
done | sort -u | sed 's/^/!/')
- [ -e .gitignore.d/$2 ] &&
- echo "$SELF: .gitignore.d/$2 exists, moving it to .gitignore.d/$2.bak" &&
- mv -f .gitignore.d/$2 .gitignore.d/$2.bak
- echo '*' > .gitignore.d/$2
+ tempfile=$(mktemp) ||
+ (echo "$SELF: fatal: could not create tempfile" && exit 1)
+ echo '*' > "$tempfile"
for gitignore in $gitignores; do
- echo $gitignore >> .gitignore.d/$2
+ echo "$gitignore" >> "$tempfile"
done
+ diff -N "$tempfile" "$HOME/.gitignore.d/$2" > /dev/null &&
+ rm -f "$tempfile" &&
+ return
+ if [ -e "$HOME/.gitignore.d/$2" ]; then
+ echo "$SELF: info: $HOME/.gitignore.d/$2 differs from new data, moving it to $HOME/.gitignore.d/$2.bak"
+ mv -f "$HOME/.gitignore.d/$2" "$HOME/.gitignore.d/$2.bak" ||
+ (echo "$SELF: fatal: could not move $HOME/.gitignore.d/$2 to $HOME/.gitignore.d/$2.bak" && exit 1)
+ fi
+ mv -f "$tempfile" "$HOME/.gitignore.d/$2" ||
+ (echo "$SELF: fatal: could not move $tempfile to $HOME/.gitignore.d/$2" && exit 1)
+ cd "$old_dir"
+ verbose "seed-gitignore end"
else
verbose "defaulting to calling help()"