diff --git a/argonfanhat.sh b/argonfanhat.sh index 83be1f7..d0e4cbd 100644 --- a/argonfanhat.sh +++ b/argonfanhat.sh @@ -231,6 +231,8 @@ else fi fi +echo "Installing/updating dependencies..." + for curpkg in ${pkglist[@]}; do sudo apt-get install -y $curpkg RESULT=$(argon_check_pkg "$curpkg") @@ -243,6 +245,8 @@ for curpkg in ${pkglist[@]}; do fi done +echo "Updating configuration ..." + # Ubuntu Mate for RPi has raspi-config too command -v raspi-config &> /dev/null if [ $? -eq 0 ] @@ -274,8 +278,9 @@ then rm $TMPCONFIGFILE fi -# Added to enabled NVMe for pi5 +# Additional config for pi5 set_nvme_default +set_maxusbcurrent # Fan Setup basename="argonone" @@ -292,6 +297,7 @@ daemonfanservice=/lib/systemd/system/$daemonname.service daemonhddconfigfile=/etc/${daemonname}-hdd.conf +echo "Installing/Updating scripts and services ..." if [ -f "$eepromrpiscript" ] then @@ -307,6 +313,13 @@ then sudo chmod 755 $upsconfigscript fi +for TMPDIRECTORY in "/lib/systemd/system" "/lib/systemd/system-shutdown" +do + sudo mkdir -p "$TMPDIRECTORY" + sudo chmod 755 $TMPDIRECTORY + sudo chown root:root "$TMPDIRECTORY" +done + # Fan Config Script sudo wget $ARGONDOWNLOADSERVER/scripts/argonone-fanconfig.sh -O $fanconfigscript --quiet sudo chmod 755 $fanconfigscript @@ -708,6 +721,8 @@ fi shortcutfile="/home/$destfoldername/Desktop/argonone-config.desktop" if [ -d "/home/$destfoldername/Desktop" ] then + echo "Creating/Updating Desktop Elements ..." + terminalcmd="lxterminal --working-directory=/home/$destfoldername/ -t" if [ -f "/home/$destfoldername/.twisteros.twid" ] then @@ -738,6 +753,8 @@ fi configcmd="$(basename -- $configscript)" +echo "Initializing Services ..." + if [ "$setupmode" = "Setup" ] then if [ -f "/usr/bin/$configcmd" ] @@ -775,10 +792,12 @@ else fi fi + if [ "$CHECKPLATFORM" = "Raspbian" ] then if [ -f "$eepromrpiscript" ] then + echo "Checking EEPROM ..." sudo apt-get update && sudo apt-get upgrade -y sudo rpi-eeprom-update # EEPROM Config Script @@ -788,8 +807,6 @@ else echo "WARNING: EEPROM not updated. Please run this under Raspberry Pi OS" fi -set_maxusbcurrent - echo "*********************" echo " $setupmode Completed "