chore: refactor

Author: licy183

.github/workflows/package_electron.yml

@@ -48,24 +48,9 @@ jobs:
       with:
         fetch-depth: 1000
         path: ${{ github.workspace }}
-    - name: Clone tur
-      uses: actions/checkout@v3
-      with:
-        repository: termux-user-repository/tur
-        fetch-depth: 1
-        path: ${{ github.workspace }}/tur-repo
-    - name: Clone termux-packages
-      uses: actions/checkout@v3
-      with:
-        repository: termux/termux-packages
-        fetch-depth: 1
-        path: ${{ github.workspace }}/main-repo
     - name: Merge repos
       run: |
-        cp -rn ./main-repo/* ./
-        rm -rf ./main-repo
-        cp -rn ./tur-repo/* ./
-        rm -rf ./tur-repo
+        ./setup-tur-electron-builder.sh
     - name: Gather build summary
       run: |
         if [ "${{ github.event_name }}" != "workflow_dispatch" ]; then

.gitignore

@@ -1,44 +1,11 @@
-# These files are from termux/termux-packages
-/termux-packages/
-/disabled-packages/
-/ndk-patches/
-/packages/
-/root-packages/
-/scripts/
-/x11-packages/
-/CODEOWNERS
-/CONTRIBUTING.md
-/build-all.sh
-/build-package.sh
-/build-package.sh.orig
-/clean.sh
-
-# Vim
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
-Session.vim
-.netrwhist
-*~
-
-# Vagrant
-scripts/*.log
-scripts/.vagrant/
-
-# Built *.deb files.
-/debs/
-/output/
-
-# Built electron *.zip files
-/output-electron/
-
-# Preinstalled build tools.
-/build-tools/
-
-# Predownloaded packages sources.
-/packages/*/cache
-/root-packages/*/cache
-/x11-packages/*/cache
-
-# VSCode
-.vscode
+# Ignore everything except these files
+*
+!.github
+!.github/**
+!.gitattributes
+!.gitignore
+!README.md
+!repo.json
+!setup-tur-electron-builder.sh
+!tur-electron
+!tur-electron/**

setup-tur-electron-builder.sh

@@ -0,0 +1,63 @@
+#!/bin/bash
+# setup-tur-electron-builder.sh - script to setup an electron building environment
+
+set -e -u -o pipefail
+
+# Enter the working directory
+basedir=$(realpath $(dirname $0))
+cd $basedir
+
+# Checkout the master branch of termux/termux-packages
+if [ -d "./termux-packages" ] && [ -d "./termux-packages/.git" ]; then
+	echo "Pulling termux-packages..."
+	pushd ./termux-packages
+	git reset --hard origin/master
+	git pull --rebase
+	popd
+else
+	rm -rf ./termux-packages
+	git clone https://github.com/termux/termux-packages.git --depth=1
+fi
+
+# Checkout the master branch of termux-user-repository/tur
+if [ -d "./tur-repo" ] && [ -d "./tur-repo/.git" ]; then
+	echo "Pulling termux-packages..."
+	pushd ./termux-packages
+	git reset --hard origin/master
+	git pull --rebase
+	popd
+else
+	rm -rf ./tur-repo
+	git clone https://github.com/termux-user-repository/tur.git tur-repo --depth=1
+fi
+
+# Push changes
+git stash -u
+
+# Delete other files
+shopt -s extglob
+rm -rf !(termux-packages|tur-repo)
+shopt -u extglob
+
+# Reset to current branch
+git reset --hard
+
+# Merge files
+cp -rn ./termux-packages/* ./
+cp -rn ./tur-repo/* ./
+
+# Pop changes
+git stash pop
+
+# Apply script patches
+shopt -s nullglob
+_patch=
+for _patch in ./common-files/building-system-patches/*.patch; do
+	echo "Applying patch: $_patch"
+	patch --silent -p1 < $_patch
+done
+unset _patch
+shopt -u nullglob
+
+# Remove files
+rm -f build-package.sh.orig