ensure building latest version of firmware

benjamink · Apr 9, 2024 · 5824799 · 5824799
1 parent fb1a298
commit 5824799
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/scripts/build-install-fn-pc-apple.sh b/scripts/build-install-fn-pc-apple.sh
@@ -13,6 +13,7 @@ git clone https://github.com/FujiNetWIFI/fujinet-firmware
 FNPIO_PATH="$FN_PATH/fujinet-firmware"
 mkdir -p "$FNPIO_PATH/build"
 cd "$FNPIO_PATH" || exit
+git pull --rebase
 
 ./build.sh -cp APPLE
 
@@ -39,4 +40,4 @@ WantedBy=multi-user.target
 EOF
 
 sudo systemctl daemon-reload
-sudo systemctl enable fn-pc-apple.service
+sudo systemctl enable fn-pc-apple.service
diff --git a/scripts/build-install-fn-pc-atari.sh b/scripts/build-install-fn-pc-atari.sh
@@ -13,6 +13,7 @@ git clone https://github.com/FujiNetWIFI/fujinet-firmware
 FNPIO_PATH="$FN_PATH/fujinet-firmware"
 mkdir -p "$FNPIO_PATH/build"
 cd "$FNPIO_PATH" || exit
+git pull --rebase
 
 ./build.sh -cp ATARI
 
@@ -39,4 +40,4 @@ WantedBy=multi-user.target
 EOF
 
 sudo systemctl daemon-reload
-sudo systemctl enable fn-pc-atari.service
+sudo systemctl enable fn-pc-atari.service
diff --git a/scripts/fujinet-sudoers.sh b/scripts/fujinet-sudoers.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -x
 
-echo "$P_USERNAME ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/fujinet
+echo "$P_USERNAME ALL=(ALL) NOPASSWD:ALL" | sudo tee -a /etc/sudoers.d/fujinet
 
 sudo chmod 440 /etc/sudoers.d/fujinet
diff --git a/scripts/user-setup.sh b/scripts/user-setup.sh
@@ -7,21 +7,28 @@ mkdir "/home/$P_USERNAME/Desktop"
 mkdir "/home/$P_USERNAME/Pictures"
 mkdir "/home/$P_USERNAME/Downloads"
 mkdir "/home/$P_USERNAME/Documents"
-mkdir "/home/$P_USERNAME/.local/bin"
+mkdir -p "/home/$P_USERNAME/.local/bin"
 mkdir -p "${P_FN_PATH:-/home/$P_USERNAME/FujiNet}"
 
+if [[ "$PACKER_BUILD_TYPE" == "qemu"  ]]
+then
+  MONITOR="monitorVirtual-1"
+else 
+  MONITOR="monitorVirtual1"
+fi
+
 DISABLE_LIGHT_LOCKER_PATH="/home/$P_USERNAME/.config/autostart/light-locker.desktop"
 
 cp /tmp/wallpaper.png "/home/$P_USERNAME/Pictures/wallpaper.png"
-cp /tmp/fn-logo-black.png "/home/$P_USERNAME/Pictures/fn-logo-black.png"
+#cp /tmp/fn-logo-black.png "/home/$P_USERNAME/Pictures/fn-logo-black.png"
 
 cat <<EOF | sudo tee /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml 
 <?xml version="1.0" encoding="UTF-8"?>
 
 <channel name="xfce4-desktop" version="1.0">
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
-      <property name="monitorVirtual1" type="empty">
+      <property name="$MONITOR" type="empty">
         <property name="workspace0" type="empty">
           <property name="color-style" type="int" value="1"/>
           <property name="image-style" type="int" value="4"/>
@@ -59,4 +66,4 @@ mkdir -p .config/autostart
 cat <<EOF > "$DISABLE_LIGHT_LOCKER_PATH"
 [Desktop Entry]
 Hidden=true
-EOF
+EOF