|
|
@ -24,7 +24,7 @@ then |
|
|
|
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` |
|
|
|
git diff --no-index --text -w $CLEAN $CAULD > $PATCH |
|
|
|
git diff --no-index --text -w $CLEAN $CAULD > $PATCH |
|
|
|
java makepatch.class $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}" |
|
|
|
else |
|
|
|
else |
|
|
|
echo "${bluf}CREATING PATCH${reset}" |
|
|
|
echo "${bluf}CREATING PATCH${reset}" |
|
|
@ -33,6 +33,6 @@ else |
|
|
|
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` |
|
|
|
git diff --no-prefix --no-index --text -w $CLEAN $CAULD > $PATCH |
|
|
|
git diff --no-prefix --no-index --text -w $CLEAN $CAULD > $PATCH |
|
|
|
java makepatch.class $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}" |
|
|
|
fi |
|
|
|
fi |
|
|
|