simplified arch os handling

DevilXD · Nov 15, 2024 · 395cd15 · 395cd15
1 parent 6ada0cf
commit 395cd15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/build.sh b/build.sh
@@ -1,6 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-clear
 dirpath=$(dirname "$(readlink -f "$0")")
 
 # Check if the virtual environment exists

diff --git a/build.spec b/build.spec
@@ -52,14 +52,8 @@ hiddenimports: list[str] = [
 
 if sys.platform == "linux":
     arch = platform.machine()
-    if arch == "x86_64":
-        datas.append((Path("/usr/lib/x86_64-linux-gnu/girepository-1.0/AyatanaAppIndicator3-0.1.typelib"), "gi_typelibs"))
-        binaries.append((Path("/usr/lib/x86_64-linux-gnu/libayatana-appindicator3.so.1"), "."))
-    elif arch == "aarch64":
-        datas.append((Path("/usr/lib/aarch64-linux-gnu/girepository-1.0/AyatanaAppIndicator3-0.1.typelib"), "gi_typelibs"))
-        binaries.append((Path("/usr/lib/aarch64-linux-gnu/libayatana-appindicator3.so.1"), "."))
-    else:
-        raise ValueError(f"Unsupported architecture: {arch}")
+    datas.append((Path(f"/usr/lib/{arch}-linux-gnu/girepository-1.0/AyatanaAppIndicator3-0.1.typelib"), "gi_typelibs"))
+    binaries.append((Path(f"/usr/lib/{arch}-linux-gnu/libayatana-appindicator3.so.1"), "."))
 
     hiddenimports.extend([
         "gi.repository.Gtk",

diff --git a/setup_env.sh b/setup_env.sh
@@ -1,6 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-clear
 dirpath=$(dirname "$(readlink -f "$0")")
 
 # Check if git is installed