Merge pull request #19 from juwancase/fix

Fix build

.github/workflows/build-on-schedule.yml

@@ -3,7 +3,7 @@ name: Build props (on schedule)
 on:
   workflow_dispatch:
   schedule:
-    - cron: '37 13 7 * *' # At 13:37 on day-of-month 7. (UTC)
+    - cron: "37 13 7 * *" # At 13:37 on day-of-month 7. (UTC)
 
 jobs:
   prepare_build:
@@ -38,34 +38,25 @@ jobs:
         # Devices to build props for
         device_name: [akita, husky, shiba, cheetah, raven, redfin]
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install APT packages
-        uses: daaku/gh-action-apt-install@v4
+        uses: actions/checkout@v4
         with:
-          packages: dos2unix zip p7zip aria2
+          submodules: recursive
 
-      - name: Install Python 3.12
+      - name: Install APT packages
         run: |
-          sudo add-apt-repository ppa:deadsnakes/ppa -y
-          sudo apt-get update -y
-          sudo apt-get install -y python3.12 python3.12-dev python3.12-venv python3.12-distutils
+          apt install -y dos2unix
 
-      - name: Install pip for Python 3.12
+      - name: Activate venv
         run: |
-          aria2c https://bootstrap.pypa.io/get-pip.py
-          python3.12 get-pip.py
-          rm get-pip.py
-
-      - name: Checkout submodules
-        id: submodule_checkout
-        run: git submodule update --init --recursive
+          python3.12 -m venv .venv/
+          . .venv/bin/activate
+          echo PATH=$PATH >> "$GITHUB_ENV"
 
       - name: Install payload_dumper
-        run: python3.12 -m pip install ./payload_dumper/
+        run: pip install ./payload_dumper/
 
       - name: Make all scripts executable
         run: chmod +x *.sh

build_magisk_module.sh

@@ -36,6 +36,7 @@ device_codename=${device_codename^}
 
 # Construct the base name
 base_name="${device_codename}_$device_build_id"
+mkdir -p "result/$base_name/"
 
 # Copy relevant files
 cp "$dir"/{module,system}.prop "result/$base_name/"

build_props.sh

@@ -277,7 +277,7 @@ device_name=$(grep_prop "ro.product.vendor.model" "$EXT_PROP_CONTENT")
 device_build_description=$(grep_prop "ro.build.description" "$EXT_PROP_CONTENT")
 device_code_name=$(grep_prop "ro.product.vendor.name" "$EXT_PROP_CONTENT")
 device_build_security_patch=$(grep_prop "ro.vendor.build.security_patch" "$EXT_PROP_CONTENT")
-device_build_fingerprint=$(grep_prop "ro.product.build.id")
+device_build_fingerprint=$(grep_prop "ro.product.build.id" "$EXT_PROP_CONTENT")
 
 add_prop_as_ini to_module_prop "id" "${device_code_name^}_Prop"
 add_prop_as_ini to_module_prop "name" "$device_name (${device_code_name^^}) Prop"

download_latest_ota_build.sh

@@ -15,7 +15,7 @@ print_message "Downloading OTA builds for the following devices: $(
 unset IFS
 
 # Make sure download directory exists
-[ ! -d ./dl ] && mkdir dl
+mkdir -p "dl"
 
 # Build a list of URL to be downloaded
 BUILD_URL_LIST=()

util_functions.sh

@@ -27,9 +27,9 @@ print_message() {
   # Print the message
   echo -e "$message"
 
-  [ "$2" = "error" ] && {
+  if [ "$2" = "error" ]; then
     exit 1
-  }
+  fi
 }
 
 # Function to install packages by name using various package managers