From bde5e8037895365804830f93218f5149fc4c68fe Mon Sep 17 00:00:00 2001
From: Elizabeth Cray <liz@cray.lgbt>
Date: Thu, 22 Oct 2026 17:47:49 -0400
Subject: [PATCH] Fixed issues from first test run

---
 lists/apt-packages     |  3 +--
 lists/flatpak-packages |  2 +-
 scripts/install.sh     | 24 ++++++++++++++++--------
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/lists/apt-packages b/lists/apt-packages
index c21fcf9..e8f7df1 100644
--- a/lists/apt-packages
+++ b/lists/apt-packages
@@ -24,6 +24,7 @@ dos2unix
 dvb-apps
 exiftool
 ffmpeg
+flatpak
 firefox-esr
 flex
 fortune
@@ -127,11 +128,9 @@ welle.io
 wget
 wireshark
 wireshark-doc
-wireshark-gtk
 x11-apps
 x11-utils
 x264
 xcowsay
 xsol
 yasm
-yt-dlp
diff --git a/lists/flatpak-packages b/lists/flatpak-packages
index 688301b..9092e9a 100644
--- a/lists/flatpak-packages
+++ b/lists/flatpak-packages
@@ -7,7 +7,7 @@ io.github.ungoogled_software.ungoogled_chromium
 io.gitlab.librewolf-community
 org.blender.Blender
 org.darktable.Darktable
-org.freecad.FreeCAD
+flathub-beta org.freecad.FreeCAD
 org.qgis.qgis
 org.videolan.VLC
 com.vscodium.codium-insiders
diff --git a/scripts/install.sh b/scripts/install.sh
index 9c1ae42..4a6d555 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -14,22 +14,19 @@ if [ "$(id -u)" -ne 0 ]; then
     echo "This script must be run as root"
     exit 1
 fi
-
+export NEEDRESTART_MODE=a
 apt install git sudo curl wget zsh -yqq
 
 git clone https://git.corrupt.link/liz/hdos.git ${HDOS_ROOT}
 chmod -R 766 ${HDOS_ROOT}
+chmod +x ${HDOS_ROOT}/scripts/*
 
 apt update
 
 apt full-upgrade -yqq
 
-INSTALLED=`dpkg --get-selections | grep -e "   install$" | sed -e 's/\t\+install//'`
-while read PACKAGE; do
-    if ! echo "$INSTALLED" | grep -q "^$PACKAGE$"; then
-        apt install -yqq "$PACKAGE"
-    fi
-done < ${HDOS_ROOT}/lists/apt-packages
+PACKAGE_LIST=$(cat ${HDOS_ROOT}/lists/apt-packages)
+apt-get install -yqm "$PACKAGE_LIST"
 
 apt autoremove -y
 
@@ -49,6 +46,16 @@ sudo -u guest ${HDOS_ROOT}/scripts/pyenv
 # Generate GPG framework
 sudo -u hacdc gpg --list-keys
 sudo -u guest gpg --list-keys
+gpg --list-keys
+
+# Setup Flatpak
+flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
+flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+flatpak update -y
+
+while read P; do
+    flatpak install -y --noninteractive "$P"
+done < ${HDOS_ROOT}/lists/flatpak-packages
 
 # Setup Shared Directory
 SHARED_DIR=/mnt/gibson
@@ -60,6 +67,7 @@ if [ ! -d ${SHARED_DIR} ]; then
     chmod 766 ${SHARED_DIR}
     sed -i "s/password=/password=${GIBSON_PASS}/" /etc/gibson
     systemctl daemon-reload
+    mkdir -p /home/guest/Desktop
     ln -s ${SHARED_DIR} /home/hacdc/Desktop/gibson
     ln -s ${SHARED_DIR} /home/guest/Desktop/gibson
     chown guest:guest /home/guest/Desktop/gibson
@@ -71,7 +79,7 @@ fi
 cp ${HDOS_ROOT}/dotfiles/htown.png /usr/share/backgrounds/htown.png
 sed -i 's/^background=.*$/background=\/usr\/share\/backgrounds\/htown.png/' /usr/share/sddm/themes/*/theme.conf.user
 
-mksquashfs /home/guest ${HDOS_ROOT}/guest.sqfs --noappend
+mksquashfs /home/guest ${HDOS_ROOT}/guest.sqfs
 cp ${HDOS_ROOT}/scripts/restore-home /usr/sbin/restore-home
 cp ${HDOS_ROOT}/dotfiles/guest-restore.service /etc/systemd/system/guest-restore.service
 systemctl daemon-reload