From 7e47bcee43977720bc8c0baed585e37ca17d59a9 Mon Sep 17 00:00:00 2001 From: Spigot Date: Mon, 14 Apr 2014 21:01:27 +1000 Subject: [PATCH] Set shell prompt to $ when running the patch scripts, helps with speed on windows. By: md_5 --- applyPatches.sh | 1 + rebuildPatches.sh | 3 +++ upstreamMerge.sh | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/applyPatches.sh b/applyPatches.sh index 4308d9f8d4..32585f94b4 100755 --- a/applyPatches.sh +++ b/applyPatches.sh @@ -1,5 +1,6 @@ #!/bin/bash +PS1="$" basedir=`pwd` echo "Rebuilding Forked projects.... " diff --git a/rebuildPatches.sh b/rebuildPatches.sh index d56ed82c23..6785d242e8 100755 --- a/rebuildPatches.sh +++ b/rebuildPatches.sh @@ -1,7 +1,9 @@ #!/bin/bash +PS1="$" basedir=`pwd` echo "Rebuilding patch files from current fork state..." + function cleanupPatches { cd "$1" for patch in *.patch; do @@ -20,6 +22,7 @@ function cleanupPatches { fi done } + function savePatches { what=$1 target=$2 diff --git a/upstreamMerge.sh b/upstreamMerge.sh index 6d71e60045..c95e357a23 100755 --- a/upstreamMerge.sh +++ b/upstreamMerge.sh @@ -1,10 +1,14 @@ #!/bin/bash + +PS1="$" basedir=`pwd` + function update { cd "$basedir/$1" git fetch && git reset --hard origin/master cd ../ git add $1 } + update Bukkit update CraftBukkit