From 82d7dc2ffe8903ab3e9d04b658fe60b64689910f Mon Sep 17 00:00:00 2001
From: shark <shark@noreply.example.org>
Date: Tue, 27 Aug 2019 21:47:08 +0000
Subject: [PATCH] Use the master branch, which is now the newest commit always

---
 bedrock-linux-99.99.99-x86_64.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/bedrock-linux-99.99.99-x86_64.sh b/bedrock-linux-99.99.99-x86_64.sh
index f6989d3..2601b80 100644
--- a/bedrock-linux-99.99.99-x86_64.sh
+++ b/bedrock-linux-99.99.99-x86_64.sh
@@ -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
+	#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
 fi
-mkdir -p /bedrock/cache
-cd /bedrock/cache
-git clone https://github.com/bedrocklinux/bedrocklinux-userland
-cd bedrocklinux-userland
-git checkout 0.7beta -q
+#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