|
@@ -29,7 +29,7 @@ MY_DIR=$(dirname $0)
|
|
|
MY_DIR=$(readlink -f "${MY_DIR}")
|
|
|
CODE_DIR="${MY_DIR}/src"
|
|
|
SITE_DIR="${CODE_DIR}/site"
|
|
|
-PATCH_DIR="${SIZE_DIR}/patches"
|
|
|
+PATCH_DIR="${SITE_DIR}/patches"
|
|
|
OUTPUT_DIR="${MY_DIR}/output"
|
|
|
IMAGE_DIR="${CODE_DIR}/output/images"
|
|
|
MODULE_DIR="${CODE_DIR}/output/modules"
|
|
@@ -127,7 +127,7 @@ popd #${SITE_DIR}
|
|
|
|
|
|
### APPLY PATCHES TO GLUON
|
|
|
progress "Applying Patches ..."
|
|
|
-git checkout -B patching base
|
|
|
+git checkout -B patching "${BASE}"
|
|
|
if [ "$(echo "${PATCH_DIR}"/*.patch)" ]; then
|
|
|
git am ${PATCH_DIR}/*.patch || (
|
|
|
git am --abort
|