From: xf0r3m <jakubstasinski@protonmail.com>
Date: Wed, 30 Aug 2023 15:04:47 +0000 (+0200)
Subject: Poprawienie określenia architektury systemu w pliku bazowym
X-Git-Url: https://gitweb.morketsmerke.org/?a=commitdiff_plain;h=6edebdeb34c1494c34ffa8e1030fb0f7593ef9a0;p=immudex-testing.git

Poprawienie określenia architektury systemu w pliku bazowym
---

diff --git a/versions/base.sh b/versions/base.sh
index c2cee54..e5e477c 100644
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+ARCH=$(dpkg --print-architecture);
 cd;
 if [ -x /usr/bin/git ]; then git clone https://git.morketsmerke.org/git/immudex-testing;
 else apt install git -y && git clone https://git.morketsmerke.org/git/immudex-testing;
@@ -16,7 +17,7 @@ echo "deb-src http://deb.debian.org/debian/ testing-updates main" >> /etc/apt/so
 update_packages;
 
 
-if [ $(uname -m) = "x86_64" ]; then
+if [ $ARCH = "amd64" ]; then
 install_packages --no-install-recommends linux-image-amd64 live-boot systemd-sysv -y;
 else
 install_packages --no-install-recommends linux-image-686-pae live-boot systemd-sysv -y;
@@ -33,7 +34,7 @@ install_packages task-desktop task-xfce-desktop;
 
 install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet mpv yt-dlp vim-gtk3 redshift irssi nmap nfs-common remmina python3-pip ffmpeg debootstrap squashfs-tools xorriso syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools chrony python3-venv isolinux rsync mutt gimp openvpn netselect-apt gvfs-backends dnsutils xfce4-notes-plugin;
 
-if [ $(dpkg --print-architecture) = "amd64" ]; then
+if [ $ARCH = "amd64" ]; then
   wget https://ftp.morketsmerke.org/immudex/testing/software/librewolf/librewolf-116.0.3-1.en-US.linux-x86_64.tar.bz2;
   tar -xf librewolf-116.0.3-1.en-US.linux-x86_64.tar.bz2 -C /usr/lib;
   rm librewolf-116.0.3-1.en-US.linux-x86_64.tar.bz2;