shark/bedrock-git
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the master branch, which is now the newest commit always

Browse Source
This commit is contained in:
shark
2019-08-27 21:47:08 +00:00
parent fde09106de
commit 82d7dc2ffe
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bedrock-linux-99.99.99-x86_64.sh
View File

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