Try to make CodeFactor A (#4)

* Try to make CodeFactor A

* Fix syntax issue of `build-and-release.yml`

Author: ThatMG393

.github/workflows/build-and-release.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - main
-    
+
 jobs:
   suite-build:
     runs-on: ubuntu-latest # buildjet-4vcpu-ubuntu-2204
@@ -16,11 +16,11 @@ jobs:
         suite: [ jammy, focal, kinetic, lunar ]
         variant: [ raw, lxqtRaw, kdeRaw, gnomeRaw, mateRaw ]
         architecture: [ armhf ] #, arm64 ] #, amd64 ]
-    
+
     steps:
       - uses: actions/checkout@v3
       - uses: docker/setup-qemu-action@v2
-      
+
       - name: ✅ Pre-Build Checks
         run: |
           if [ -d "suites/${{ matrix.suite }}" ]; then
@@ -32,17 +32,17 @@ jobs:
             echo "Error: ${{ matrix.suite }} is not a valid suite!"
             exit 1
           fi
-          
+
       - name: ⤵️ Install Dependencies
         run: |
           sudo apt-get update
           sudo apt-get install git build-essential binfmt-support qemu-user-static debootstrap -y
-      
+
       - name: 📥 Download Submodules
         run: |
           git submodule init
           git submodule update
-      
+
       - name: 🛠️ Build ${{ matrix.suite }}-${{ matrix.variant }}-${{ matrix.architecture }}
         run: sudo bash build.sh -s ${{ matrix.suite }} -v ${{ matrix.variant }} -a ${{ matrix.architecture }}
 
@@ -51,26 +51,26 @@ jobs:
         with:
           name: ${{ matrix.suite }}-${{ matrix.architecture }}-tarballs
           path: fs-cook/out/${{ matrix.suite }}-${{ matrix.variant }}-${{ matrix.architecture }}.tar.gz
-      
+
   create-release:
     runs-on: ubuntu-latest
-    
+
     if: ${{ always() }}
     needs: suite-build
-    
+
     steps:
       - uses: actions/checkout@v3
         with:
           token: ${{ secrets.RELEASE_TOKEN }}
-      
+
       - name: 📥 Download All Tarballs
         uses: actions/download-artifact@v3
-      
+
       # Debug Purposes
       - name: List Tarballs
         run: |
           ls *-*/*.tar.gz
-      
+
       - name: 🏷 Generate Release Tag
         run: |
           udroid_version=$(git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' \
@@ -87,7 +87,7 @@ jobs:
 
       - name: 📝 Generate Release Notes
         run: sudo bash /home/runner/work/udroid-download/udroid-download/.github/scripts/generate-release-notes.sh
-      
+
       - name: ⬆️ Upload Suite Tarballs
         uses: ncipollo/release-action@v1
         with:
@@ -99,10 +99,10 @@ jobs:
           prerelease: false
           artifacts: '*-*-tarballs/*.tar.gz'
           makeLatest: true
-          
+
       - name: ⚙️ Generate New distro-data.json
         run: sudo python3 gen_data/gen-update-json.py --release-tag ${{ env.VERSIONTAG }}
-      
+
       - name: ⚙️ Update distro-data.json
         uses: stefanzweifel/git-auto-commit-action@v4
         with:

gen_data/gen-update-json.py

@@ -4,11 +4,11 @@
 import utils
 import arch
 
-GIT_ROOT        = os.popen("git rev-parse --show-toplevel").read().strip()
-GIT_REMOTE_URL  = os.popen("git config --get remote.origin.url").read().strip()
-DIR             = "."
-VERBOSE         = False
-JSON_CONF       = f"{GIT_ROOT}/distro-data.json"
+GIT_ROOT = utils.Popen("git rev-parse --show-toplevel")
+GIT_REMOTE_URL = utils.Popen("git config --get remote.origin.url")
+DIR = "."
+VERBOSE = False
+JSON_CONF = f"{GIT_ROOT}/distro-data.json"
 
 def update_json_conf(file) -> None:
     data = strip_info(file)
@@ -36,17 +36,17 @@ def strip_info(file):
     name = os.path.splitext(basename)[0]
     name = os.path.splitext(name)[0]
 
-    sp       = name.split("-")
+    sp = name.split("-")
     StoPdict = arch.translated_arch()
 
-    suite   = sp[0]
+    suite = sp[0]
     variant = sp[1]
-    packageArchitecture  = StoPdict[sp[2]]
+    packageArchitecture = StoPdict[sp[2]]
 
     return [suite, variant, packageArchitecture, basename]
 
 def get_release_url(release_tag, file) -> str:
-    url  ="{}/releases/download/{}/{}".format(GIT_REMOTE_URL, release_tag, file)
+    url = "{}/releases/download/{}/{}".format(GIT_REMOTE_URL, release_tag, file)
     return url
 
 if __name__ == '__main__':

gen_data/utils.py

@@ -1,4 +1,5 @@
 import os
+import subprocess
 
 def add_suite(JsonFile: dict, suite: str) -> None:
     """ Add suite to the JsonFile
@@ -82,3 +83,6 @@ def getfilesR(path: str) -> list:
             files.append(os.path.join(r, file))
 
     return files
+    
+def Popen(cmd: str) -> str:
+    return subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().strip()