Update upstream

This commit is contained in:
William Blake Galbreath
2019-05-04 00:23:04 -05:00
parent 65e4566aa4
commit f74678371d
12 changed files with 174 additions and 287 deletions

14
purpur
View File

@@ -22,6 +22,18 @@ purpurunstash() {
}
case "$1" in
"a" | "am" | "amend")
(
cd $basedir/Purpur-API/
git add .
git commit --amend --no-edit
cd $basedir/Purpur-Server/
git add .
git commit --amend --no-edit
cd $basedir
scripts/rebuildpatches.sh "$basedir"
)
;;
"rb" | "rbp" | "rebuild")
(
set -e
@@ -41,7 +53,7 @@ case "$1" in
basedir
mvn -N install
cd ${FORK_NAME}-API
mvn clean install && cd ../${FORK_NAME}-Server && mvn clean install
mvn -e clean install && cd ../${FORK_NAME}-Server && mvn -e clean install
)
;;
"d" | "de" | "deploy")