Updated build process to pull release from github. See https://www.dfworkshop.net/retiring-live-builds-page/ for details.

1 files changed, 25 insertions, 43 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 16ea182ef29a..4f218f4ff693 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,58 +10,46 @@ depends=('wget' 'unzip')
 source=(daggerfall-unity
   daggerfall.desktop
   settings-template.ini
-  data-files.txt)
+  data-files.txt
+  https://github.com/Interkarma/daggerfall-unity/releases/download/v$pkgver-beta/linux_64bit-v$pkgver-beta.zip)
 sha256sums=(0b312ea87a391da827da5296a59f6c19412a408d497ce06bbe68b45be98c3bcb
   1015b75af1876313bf8727cc57dc3c033e82b0904ee623a6944c333d6e4de1ae
   f8c7e4de325a5a25add4b2404cfdaa59f490a7cc43c89f4b72ed12db66e52ff5
   a6a45d321dda7b98484dbe38099d8f697c3d25e570a7bfbcdd975c206cadef2f
+  bc1bd26d493e84653f742ec33259a5442f0507fc3c93a12e5743d3333e6be992
 )
 
-#Package Variables
-INC_DATA_FILES=FALSE
+###Package Variables###
+
+#Flag for if game data files are from google or local pc
+REMOTE_DATA_FILES=FALSE
+
+#Engine zip file name
+ENGINE_NAME=linux_64bit-v$pkgver-beta.zip
 
 #Directory Names
 DEST_DIR="opt/daggerfall-unity"
 ENGINE_DIR="engine"
 DATA_DIR="data"
 
-#Dagger Unity Build Variables
-BUILD_ID="byupce0pWw"
-REMOTE_BUILD_GENERATOR="https://build-api.cloud.unity3d.com/api/v1/shares/"
-
 #Daggerfall Data Variables
 REMOTE_DATA_ID="0B0i8ZocaUWLGWHc1WlF3dHNUNTQ"
 REMOTE_DATA="https://drive.google.com/uc?export=download&confirm=h2vF&id="
 
 #SHA256 Hashes
-ENGINE_HASH="BC1BD26D493E84653F742EC33259A5442F0507FC3C93A12E5743D3333E6BE992"
 DATA_HASH="8be67a4ebb76ed684968f49d29cbbe57b0c10dc4554d111d64356a2355be5083"
 
 build() {
-  echo "Downloading game engine..."
-  #Get link for engine download
-  wget -O link.json $REMOTE_BUILD_GENERATOR$BUILD_ID
-
-  #Parse json to get download link
-  TMP_ENGINE_LINK=$(grep -Po 'https://storage.googleapis.com/unitycloud-build-user-svc-live-build/.*?zip"(,|})' link.json)
-  TMP_ENGINE_LINK=$(echo  "$TMP_ENGINE_LINK" | sed -n 1p)
-  TMP_ENGINE_LINK=${TMP_ENGINE_LINK%?};
-  TMP_ENGINE_LINK=${TMP_ENGINE_LINK%?};
-
-  #Download the engine
-  wget -O engine.zip "$TMP_ENGINE_LINK"
-  echo "Done."
-
   #Download game data if not already downloaded
   if [ ! -d "/$DEST_DIR/$DATA_DIR" ]; then
     echo "Data files not found at /$DEST_DIR/$DATA_DIR/. Flagging for Download."
-    INC_DATA_FILES="TRUE"
+    REMOTE_DATA_FILES="TRUE"
   else
     echo "Data files found at /$DEST_DIR/$DATA_DIR/. Skipping download."
-    INC_DATA_FILES="FALSE"
+    REMOTE_DATA_FILES="FALSE"
   fi
 
-  if [ $INC_DATA_FILES == "TRUE" ]; then
+  if [ $REMOTE_DATA_FILES == "TRUE" ]; then
     echo "Downloading game data..."
     #Get link for game data
     wget --save-cookies cookies.txt -O data.html $REMOTE_DATA$REMOTE_DATA_ID
@@ -80,42 +68,36 @@ build() {
 check() {
   #Check if data files need checking
   if [ ! -d "/$DEST_DIR/$DATA_DIR" ]; then
-    INC_DATA_FILES="TRUE"
+    REMOTE_DATA_FILES="TRUE"
   else
-    INC_DATA_FILES="FALSE"
+    REMOTE_DATA_FILES="FALSE"
   fi
 
-  if [ $INC_DATA_FILES == "TRUE" ]; then
-    echo "Checking data files integrity"
+  if [ $REMOTE_DATA_FILES == "TRUE" ]; then
+    echo "Checking downloaded data files integrity"
     DATA_VALID=$(echo "$DATA_HASH ${srcdir}/data.zip" | sha256sum -c | grep -o OK)
     if [ $DATA_VALID == "OK" ]; then
       echo "Data file confirmed to be valid"
     fi
   else
-    echo "Include data flag not set. Skipping data integrity check."
-  fi
-
-  echo "Checking engine files integrity"
-  ENGINE_VALID=$(echo "$ENGINE_HASH ${srcdir}/engine.zip" | sha256sum -c | grep -o OK)
-  if [ $ENGINE_VALID == "OK" ]; then
-    echo "Engine file confirmed to be valid"
+    echo "Data files already exist. Skipping data integrity check."
   fi
 }
 
 package() {
   #Check if data files need packaging
   if [ ! -d "/$DEST_DIR/$DATA_DIR" ]; then
-    INC_DATA_FILES="TRUE"
+    REMOTE_DATA_FILES="TRUE"
   else
-    INC_DATA_FILES="FALSE"
+    REMOTE_DATA_FILES="FALSE"
   fi
 
   echo "Making the required package directories..."
   #Make required package directories
-  if [ $INC_DATA_FILES == "TRUE" ]; then
+  if [ $REMOTE_DATA_FILES == "TRUE" ]; then
     mkdir -p "${pkgdir}/${DEST_DIR}/${DATA_DIR}"
   else
-    echo "Include data flag not set. Skipping data folder creation."
+    echo "Download data flag not set. Skipping data folder creation."
   fi
   mkdir -p "${pkgdir}/${DEST_DIR}/${ENGINE_DIR}"
   mkdir -p "${pkgdir}/usr/share/applications"
@@ -125,7 +107,7 @@ package() {
 
   echo "Unpacking the downloaded archives..."
   #Unpack archives
-  if [ $INC_DATA_FILES == "TRUE" ]; then
+  if [ $REMOTE_DATA_FILES == "TRUE" ]; then
     echo "Download data flag set. Extracting downloaded data to package."
     unzip -q "${srcdir}/data.zip" -d "${pkgdir}/${DEST_DIR}/${DATA_DIR}"
   else
@@ -150,10 +132,10 @@ package() {
         fi
     done
   fi
-  unzip -q "${srcdir}/engine.zip" -d "${pkgdir}/${DEST_DIR}/${ENGINE_DIR}"
+  unzip -q "${srcdir}/$ENGINE_NAME" -d "${pkgdir}/${DEST_DIR}/${ENGINE_DIR}"
   echo "Done."
 
-  echo "Copying the additonal package files to the package..."
+  echo "Copying the additonal files to the package..."
   #Add script for running program and make executable
   cp ${srcdir}/daggerfall-unity ${pkgdir}/usr/bin/daggerfall-unity