Misterzym
/
KCauldron-minecraft-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

More makepatch.sh fixes

master
Robotia 9 years ago
parent
f0ea15ab97
commit
54c6778cb5
1 changed files with 19 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      makepatch.sh

20
makepatch.sh
Unescape View File

@ -15,8 +15,14 @@ then
CLEAN=`find eclipse/Clean/src/main/java | grep $FILE` CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
CAULD=`find eclipse/cauldron/src/main/java | grep $FILE` CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
PATCH=`find patches/ | grep -i $FILE` PATCH=`find patches/ | grep -i $FILE`
if [[ -z "$PATCH" ]]
then
PATCH = "patches/$FILE"
mkdir -p $PATCH
touch $PATCH
fi
echo "Diff patch of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} below."
git diff --no-index --no-prefix --text $CLEAN $CAULD git diff --no-index --no-prefix --text $CLEAN $CAULD
echo "Diff patch of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} above."
elif [ $1 == "make" ] elif [ $1 == "make" ]
then then
echo "${bluf}CREATING PATCH${reset}" echo "${bluf}CREATING PATCH${reset}"
@ -24,6 +30,12 @@ then
CLEAN=`find eclipse/Clean/src/main/java | grep $FILE` CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
CAULD=`find eclipse/cauldron/src/main/java | grep $FILE` CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
PATCH=`find patches/ | grep -i $FILE` PATCH=`find patches/ | grep -i $FILE`
if [[ -z "$PATCH" ]]
then
PATCH = "patches/$FILE"
mkdir -p $PATCH
touch $PATCH
fi
git diff --no-prefix --no-index --text $CLEAN $CAULD > $PATCH git diff --no-prefix --no-index --text $CLEAN $CAULD > $PATCH
java makepatch $PATCH java makepatch $PATCH
echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}" echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}"
@ -33,6 +45,12 @@ else
CLEAN=`find eclipse/Clean/src/main/java | grep $FILE` CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
CAULD=`find eclipse/cauldron/src/main/java | grep $FILE` CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
PATCH=`find patches/ | grep -i $FILE` PATCH=`find patches/ | grep -i $FILE`
if [[ -z "$PATCH" ]]
then
PATCH = "patches/$FILE"
mkdir -p $PATCH
touch $PATCH
fi
git diff --no-prefix --text --no-index $CLEAN $CAULD > $PATCH git diff --no-prefix --text --no-index $CLEAN $CAULD > $PATCH
java makepatch $PATCH java makepatch $PATCH
echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}" echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}"

Write Preview
Loading…
Cancel
Save