|
|
|
@ -3,13 +3,17 @@
|
|
|
|
|
. /bedrock/share/common-code
|
|
|
|
|
echo "Fetching latest commits from repository..."
|
|
|
|
|
if [ -d /bedrock/cache/bedrocklinux-userland ]; then
|
|
|
|
|
less_lethal_rm_rf /bedrock/cache/bedrocklinux-userland
|
|
|
|
|
fi
|
|
|
|
|
#less_lethal_rm_rf /bedrock/cache/bedrocklinux-userland
|
|
|
|
|
cd /bedrock/cache/bedrocklinux-userland
|
|
|
|
|
make clean
|
|
|
|
|
git pull
|
|
|
|
|
else
|
|
|
|
|
mkdir -p /bedrock/cache
|
|
|
|
|
cd /bedrock/cache
|
|
|
|
|
git clone https://github.com/bedrocklinux/bedrocklinux-userland
|
|
|
|
|
cd bedrocklinux-userland
|
|
|
|
|
git checkout 0.7beta -q
|
|
|
|
|
fi
|
|
|
|
|
#git checkout 0.7beta -q #no longer needed, paradigm made master have the latest commit
|
|
|
|
|
current_version="$(awk '{print$3}' </bedrock/etc/bedrock-release)"
|
|
|
|
|
newest_version="$(awk -F= '/^BEDROCK_VERSION=/{print$2}' Makefile | sed 's/[a-z].*$//')git$(git log | grep -c '^commit')"
|
|
|
|
|
echo "Current Version: ${current_version}"
|
|
|
|
@ -25,7 +29,6 @@ else
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
# Start the build process
|
|
|
|
|
make clean
|
|
|
|
|
#if ! grep -q BEDROCK_VERSION Makefile; then # Fix bug with building BusyBox
|
|
|
|
|
# sed 's/VERSION/BEDROCK_VERSION/g' Makefile > Makefile-new
|
|
|
|
|
# mv Makefile-new Makefile
|
|
|
|
|