diff options
| author | Tucker Evans <tuckerevans24@gmail.com> | 2018-03-06 21:57:31 -0500 |
|---|---|---|
| committer | Tucker Evans <tuckerevans24@gmail.com> | 2018-03-06 21:57:31 -0500 |
| commit | 9b3aa05cd4d579d15cf3602e373749b4ed387748 (patch) | |
| tree | c13abb7adce6fab4996b93cc86b535e54646f164 | |
| parent | 4c0bdbe7b5a6b8c98d26fbfee601893a7f9a708c (diff) | |
Adds makefile and fixes bugs in plug.sh
| -rw-r--r-- | makefile | 12 | ||||
| -rwxr-xr-x | src/plug.sh (renamed from plug.sh) | 50 |
2 files changed, 30 insertions, 32 deletions
diff --git a/makefile b/makefile new file mode 100644 index 0000000..5656fe7 --- /dev/null +++ b/makefile @@ -0,0 +1,12 @@ +PREFIX ?= /usr/local +BINDIR ?= $(PREFIX)/bin +MANSUB ?= share/man +MANDIR ?= $(PREFIX)/$(MANSUB) + +install: + cp src/plug.sh $(BINDIR)/plug + cp man/plug.1 $(MANDIR)/ + +uninstall: + rm -f $(BINDER)/plug + rm -f $(MANDIR)/plug.1 @@ -45,8 +45,10 @@ touch $LOG_FILE git_commit() { [[ -n GIT_DIR ]] || return 1 [[ -n COMMIT_MSG ]] || return 1 - - return git -C GIT_DIR commit -m"$COMMIT_MSG" >> $LOG_FILE + git -C $GIT_DIR add "$VIM_PATH/.vim/pack/*" + git -C $GIT_DIR commit -m"$COMMIT_MSG + Commit created by PlugVim" >> $LOG_FILE + return } # @@ -64,7 +66,7 @@ cmd_usage () { cmd_version cat <<-EOF Usage: - $PROGRAM install [-orn] [-g GIT REPO] [-d .vim LOCATION] git-repo + $PROGRAM install [-oc] [-g GIT REPO] [-d .vim LOCATION] git-repo Install plugin located at git-repo. $PROGRAM update [-c] [-j NUMBER OF THREADS] [-g GIT REPO] Update all git modules @@ -120,15 +122,9 @@ cmd_install() { if [[ -n $COMMIT_MSG ]] then echo "Commiting Changes..." - COMMIT_MSG="$COMMIT_MSG$PLUGNAME" - if git -C $GIT_DIR add .gitmodules $FILENAME >> $LOG_FILE && \ - git_commit >> $LOG_FILE - then - echo "Changes Commited" - else - echo "Error committing changes" - return 1 - fi + COMMIT_MSG="$COMMIT_MSG$PLUG_NAME" + echo $COMMIT_MSG + git_commit >> $LOG_FILE fi else exit 1 @@ -166,13 +162,7 @@ cmd_update() { if [[ -n $COMMIT_MSG ]] then echo "Commiting Changes..." - if git_commit >> $LOG_FILE - then - echo "Changes Commited" - else - echo "Error committing changes" - return 1 - fi + git_commit >> $LOG_FILE fi else exit 1 @@ -208,8 +198,8 @@ cmd_remove() { esac done - NAME="${!OPTIND}" - FILENAME="$VIM_PATH/$PLUG_PATH$NAME" + PLUG_NAME="${!OPTIND}" + FILENAME="$VIM_PATH/$PLUG_PATH$PLUG_NAME" if git -C $GIT_DIR submodule deinit -f $FILENAME >> $LOG_FILE &&\ git -C $GIT_DIR rm -f $FILENAME >> $LOG_FILE&& \ @@ -219,21 +209,17 @@ cmd_remove() { if [[ -n $COMMIT_MSG ]] then echo "Commiting Changes..." - COMMIT_MSG="$COMMIT_MSG$PLUGNAME" - if git_commit >> $LOG_FILE - then - echo "Changes Commited" - else - echo "Error committing changes" - return 1 - fi + COMMIT_MSG="$COMMIT_MSG$PLUG_NAME" + echo $PLUG_NAME + echo $COMMIT_MSG + git_commit >> $LOG_FILE fi else - echo "Error removing $NAME" + echo "Error removing $PLUG_NAME" exit 1 fi - echo "$NAME removed" + echo "$PLUG_NAME removed" return 0 } @@ -270,7 +256,7 @@ case "$1" in shift cmd_install "$@" ;; - help|--help) + help|--help|-h|-help) shift cmd_usage "$@" ;; |