core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run paper upstream from anywhere 

woops
This commit is contained in:
Zach Brown 2016-09-07 19:45:47 -05:00
parent 9963d9d4ae
commit 53bb048935
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
paper
View File

@ -75,7 +75,10 @@ case "$1" in
cd "${PAPER_TEST_DIR:-$basedir/work/test-server}" cd "${PAPER_TEST_DIR:-$basedir/work/test-server}"
;; ;;
"u" | "up" | "upstream") "u" | "up" | "upstream")
(
cd "$basedir"
scripts/upstreamMerge.sh "$basedir" "$2" scripts/upstreamMerge.sh "$basedir" "$2"
)
;; ;;
"r" | "root") "r" | "root")
cd "$basedir" cd "$basedir"