diff -Nru juno-installer-0.3.44/debian/changelog juno-installer-0.4.0/debian/changelog --- juno-installer-0.3.44/debian/changelog 2024-03-17 08:01:52.000000000 +0000 +++ juno-installer-0.4.0/debian/changelog 2024-04-10 08:01:52.000000000 +0000 @@ -1,8 +1,5 @@ -juno-installer (0.3.44) jammy; urgency=low +juno-installer (0.4.0-1) noble; urgency=low - * Bug fix for Tab 2 - * Added: FA780 - * Added: NP5x_NP6x_NP7xRNA_RNB - * Added: NP5x_60_7x_RNx1 + * Initial Release for 24.04 - -- Juno Sun, 17 Mar 2024 08:01:52 +0000 + -- Juno Tue, 10 Apr 2024 08:01:52 +0000 diff -Nru juno-installer-0.3.44/debian/postinst juno-installer-0.4.0/debian/postinst --- juno-installer-0.3.44/debian/postinst 2021-10-16 23:05:01.000000000 +0000 +++ juno-installer-0.4.0/debian/postinst 2024-04-10 08:01:52.000000000 +0000 @@ -4,5 +4,5 @@ chmod a+x juno-installer chmod a+x GNOME/install.sh -chmod a+x generic/install.sh +chmod a+x NVIDIA/install.sh chmod a+x generic/uninstall.sh diff -Nru juno-installer-0.3.44/juno-installer/GNOME/install.sh juno-installer-0.4.0/juno-installer/GNOME/install.sh --- juno-installer-0.3.44/juno-installer/GNOME/install.sh 2024-03-17 08:01:52.000000000 +0000 +++ juno-installer-0.4.0/juno-installer/GNOME/install.sh 2024-03-29 12:33:05.000000000 +0000 @@ -1,123 +1,16 @@ #!/bin/bash -product_model="$(sed -e 's/^\s*//g' -e 's/\s*$//g' "/sys/devices/virtual/dmi/id/product_name" | tr ' ,/-' '_')" -product_model1="$(dmidecode | grep -A3 '^Base Board Information' | grep 'Product Name' | awk '{print $3}')" -nvidia="$(hwinfo --gfxcard | grep -oh -m 1 'nVidia')" -chassis="$(hostnamectl | awk 'FNR==3 {print $2}')" -tablet="$(awk '{print substr($0,0,3);}' /sys/class/dmi/id/bios_version)" -tablet2="$(strings /sys/firmware/acpi/tables/DSDT | grep -o -m 1 -i 'NSA2513' | sort)" -options=("Yes" "No") +de="$(ps axf | grep -Po "env \.*[A-Z]+" | awk '{print $2}' | sort -u)" -#INSTALL FOR GNOME -case "$product_model" in - To_Be_Filled_By_O.E.M|TB_4000|SYSTEM_PRODUCT_NAME) - apt install -o Dpkg::Options::="--force-overwrite" juno-brutus -y - ;; - FA780) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers -y - ;; - Default_string) - if [ $tablet = 'JP2' ]; then - apt install -o Dpkg::Options::="--force-overwrite" linux-oem-latest -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-tablet juno-toolbar-icons gnome-shell-extension-prefs -y; - fi - if [ $chassis = 'desktop' ]; then - apt install -o Dpkg::Options::="--force-overwrite" juno-brutus juno-nvidia-drivers -y; - flatpak install com.leinardi.gwe --system -y; - fi - ;; - N130BU|N131BU|N130WU|N131WU|N13xWU|N13xZU|N13_N140ZU|N140ZU|N141ZU|N140BU|N141BU|N140WU|N141WU|N14xWU|N140CU|N141CU|N14xCU|N240GU|N24_25GU|N240WU|NL40CU|NL41CU|NL4xCU|NL40_50CU|NL4x_NL5xLU|NLx0MU) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - if [ "$(juno-display | grep '15.5' | awk '{print $2}')" == '15.5' ]; then - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y - fi - ;; - NLxxPUx) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - if [ "$(juno-display | grep '15.3' | awk '{print $2}')" == '15.3' ]; then - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y - fi - ;; - NL50NU|NL51NU|NL5xNU|NL4x_NL5xNU) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y; - ;; - NV4XMZ|NV4XMB_ME_MZ|NV4XMB,ME,MZ|NV4XMJ_MK_MH|NV4xPZ) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y - if [ $nvidia = 'nVidia' ]; then - echo "Nvidia detected"; - apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y; - prime-select nvidia - fi - ;; - N150ZU|N151ZU|N15xZU|N150CU|N151CU|N15xCU|NS50MU|NS50_70MU|NL50RU|NL51RU|NL5xRU|NL4x_NL5xRU|NS5x_NS7xPU|NS5x_NS7xAU) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y - ;; - NL40GU|NL41GU|NL4xGU|NL40_50GU) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers clevo-keyboard -y - ;; - NJ5x_NJ7xLU|NJ5x_NJ7xCU|NJ50_70CU|NJx0MU|NJx0PU) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y; - apt install libdvd-pkg -y; - dpkg-reconfigure libdvd-pkg - ;; - NUC7i3BNH|NUC7i5BNH|NUC7i7BNH|NUC8i3BEH|NUC8i5BEH|NUC8i7BEH|NUC10i3FNH|NUC10i5FNH|NUC10i7FNH|NUC10i3FNK|NUC10i5FNK|NUC10i7FNK|BQM5) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers -y - ;; - PCX0DX|PCx0Dx|NP50DE_DB|NP50D5|NH5x_7xDPx|PC5x_7xHP_HR_HS|NP5x_NP7xHH_HJ_HK|NP5x_NP6x_NP7xHP|NP5x_NP6x_NP7xPNK_PNH_PNJ|NP5x_NP6x_NP7xPNP|PD5x_7xPNP_PNN_PNT|PD5x_7xPNP_PNR_PNN_PNT|PE60RNE_RND_RNC|NP5x_NP6x_NP7xRNJ_RNH|NP5x_NP6x_NP7xRNA_RNB|NP5x_60_7x_RNx1) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y; - prime-select nvidia; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y; - ;; - NH5xVR) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y - ;; - X370SNx) - apt install -o Dpkg::Options::="--force-overwrite" juno-ubuntu-drivers juno-fan-indicator clevo-keyboard -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y; - prime-select nvidia; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-ite -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y; - ;; +case "$de" in + GNOME|gnome) + echo "$de Detected! Installing Drivers"; + echo ""; + sleep 1 + apt install -o Dpkg::Options::="--force-overwrite" chrome-gnome-shell gnome-shell-extension-prefs gnome-tweaks gnome-software-plugin-flatpak gnome-software-plugin-snap juno-toolbar-icons -y; + apt install -o Dpkg::Options::="--force-overwrite" gnome-usage -y; + apt purge --remove gnome-system-monitor -y; + snap refresh; + snap remove snap-store + ;; esac - -case "$tablet2" in - NSA2513) - apt install -o Dpkg::Options::="--force-overwrite" linux-oem-latest -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-tablet juno-toolbar-icons gnome-shell-extension-prefs gnome-software-plugin-flatpak gnome-software-plugin-snap -y; - apt install -o Dpkg::Options::="--force-overwrite" da280-juno-dkms -y - ;; -esac - - apt install -o Dpkg::Options::="--force-overwrite" gnome-usage -y; - apt purge --remove gnome-system-monitor -y; - apt update; - apt dist-upgrade -y; - sleep 1 - apt dist-upgrade -y; - dpkg --configure -a; - apt autoremove -y; - snap refresh; - snap remove snap-store; - echo "" - echo "INSTALLATION COMPLETE" - echo "Would you like to restart?" - -select opt in "${options[@]}" -do - case $opt in - "Yes") - echo "Restaring now..." - reboot -f - break - ;; - "No") - break - ;; - esac -done diff -Nru juno-installer-0.3.44/juno-installer/NVIDIA/install.sh juno-installer-0.4.0/juno-installer/NVIDIA/install.sh --- juno-installer-0.3.44/juno-installer/NVIDIA/install.sh 1970-01-01 00:00:00.000000000 +0000 +++ juno-installer-0.4.0/juno-installer/NVIDIA/install.sh 2024-03-29 12:15:48.000000000 +0000 @@ -0,0 +1,19 @@ +#!/bin/bash + +nvidia="$(lshw -C display | grep -ioh -- "nvidia" | head -1)" +product_model="$(sed -e 's/^\s*//g' -e 's/\s*$//g' "/sys/devices/virtual/dmi/id/product_name" | tr ' ,/-' '_')" + +case "$nvidia" in + NVIDIA|Nvidia|nvidia|NVidia|nVidia) + echo "NVIDIA Graphics Detected - Installing Drivers"; + sleep 1; + apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y + ;; +esac + +# RGB Per Key Keyboard +case "$product_model" in + X370SNx) + apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-ite -y; + ;; +esac diff -Nru juno-installer-0.3.44/juno-installer/generic/install.sh juno-installer-0.4.0/juno-installer/generic/install.sh --- juno-installer-0.3.44/juno-installer/generic/install.sh 2024-03-17 08:01:52.000000000 +0000 +++ juno-installer-0.4.0/juno-installer/generic/install.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -#!/bin/bash - -product_model="$(sed -e 's/^\s*//g' -e 's/\s*$//g' "/sys/devices/virtual/dmi/id/product_name" | tr ' ,/-' '_')" -product_model1="$(dmidecode | grep -A3 '^Base Board Information' | grep 'Product Name' | awk '{print $3}')" -nvidia="$(hwinfo --gfxcard | grep -oh -m 1 'nVidia')" -chassis="$(hostnamectl | awk 'FNR==3 {print $2}')" -tablet="$(awk '{print substr($0,0,3);}' /sys/class/dmi/id/bios_version)" -tablet2="$(strings /sys/firmware/acpi/tables/DSDT | grep -o -m 1 -i 'NSA2513' | sort)" -options=("Yes" "No") - -#INSTALL FOR GNOME -case "$product_model" in - To_Be_Filled_By_O.E.M|TB_4000|SYSTEM_PRODUCT_NAME|FA780) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers -y - ;; - Default_string) - if [ $tablet = 'JP2' ]; then - apt install -o Dpkg::Options::="--force-overwrite" linux-oem-latest -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-tablet -y; - fi - if [ $chassis = 'desktop' ]; then - apt install -o Dpkg::Options::="--force-overwrite" juno-brutus juno-nvidia-drivers -y; - flatpak install com.leinardi.gwe --system -y; - fi - ;; - N130BU|N131BU|N130WU|N131WU|N13xWU|N13xZU|N13_N140ZU|N140ZU|N141ZU|N140BU|N141BU|N140WU|N141WU|N14xWU|N140CU|N141CU|N14xCU|N240GU|N24_25GU|N240WU|NL40CU|NL41CU|NL4xCU|NL40_50CU|NL4x_NL5xLU|NLx0MU|NLxxPUx) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard-controller -y; - ;; - NL50NU|NL51NU|NL5xNU|NL4x_NL5xNU) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard-controller -y; - ;; - NV4XMZ|NV4XMB_ME_MZ|NV4XMB,ME,MZ|NV4XMJ_MK_MH|NV4xPZ) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard-controller -y - if [ $nvidia = 'nVidia' ]; then - echo "Nvidia detected"; - apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y; - prime-select nvidia - fi - ;; - N150ZU|N151ZU|N15xZU|N150CU|N151CU|N15xCU|NS50MU|NS50_70MU|NL50RU|NL51RU|NL5xRU|NL4x_NL5xRU|NS5x_NS7xPU|NS5x_NS7xAU) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard-controller -y; - ;; - NL40GU|NL41GU|NL4xGU|NL40_50GU) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers clevo-keyboard-controller -y - ;; - NJ5x_NJ7xLU|NJ5x_NJ7xCU|NJ50_70CU|NJx0MU|NJx0PU) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard-controller -y; - apt install -o Dpkg::Options::="--force-overwrite" libdvd-pkg -y; - dpkg-reconfigure libdvd-pkg - ;; - NUC7i3BNH|NUC7i5BNH|NUC7i7BNH|NUC8i3BEH|NUC8i5BEH|NUC8i7BEH|NUC10i3FNH|NUC10i5FNH|NUC10i7FNH|NUC10i3FNK|NUC10i5FNK|NUC10i7FNK|BQM5) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers -y - ;; - PCX0DX|PCx0Dx|NP50DE_DB|NP50D5|NH5x_7xDPx|PC5x_7xHP_HR_HS|NP5x_NP7xHH_HJ_HK|NP5x_NP6x_NP7xHP|NP5x_NP6x_NP7xPNK_PNH_PNJ|NP5x_NP6x_NP7xPNP|PD5x_7xPNP_PNN_PNT|PD5x_7xPNP_PNR_PNN_PNT|PE60RNE_RND_RNC|NP5x_NP6x_NP7xRNJ_RNH|NP5x_NP6x_NP7xRNA_RNB|NP5x_60_7x_RNx1) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard-controller -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-nvidia-drivers -y; - prime-select nvidia - ;; - NH5xVR) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevo-keyboard -y; - apt install juno-nvidia-drivers -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y - ;; - X370SNx) - apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator -y; - apt install juno-nvidia-drivers -y; - prime-select nvidia; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-ite -y; - apt install -o Dpkg::Options::="--force-overwrite" clevo-keyboard-controller -y - ;; -esac - -case "$tablet2" in - NSA2513) - apt install -o Dpkg::Options::="--force-overwrite" linux-oem-latest -y; - apt install -o Dpkg::Options::="--force-overwrite" juno-tablet -y; - apt install -o Dpkg::Options::="--force-overwrite" da280-juno-dkms -y; - ;; -esac - - apt update; - apt dist-upgrade -y; - sleep 1 - apt dist-upgrade -y; - dpkg --configure -a; - apt autoremove -y; - echo "" - echo "INSTALLATION COMPLETE" - echo "Would you like to restart?" - -select opt in "${options[@]}" -do - case $opt in - "Yes") - echo "Restaring now..." - reboot -f - break - ;; - "No") - break - ;; - esac -done - diff -Nru juno-installer-0.3.44/juno-installer/generic/uninstall.sh juno-installer-0.4.0/juno-installer/generic/uninstall.sh --- juno-installer-0.3.44/juno-installer/generic/uninstall.sh 2023-08-01 14:49:57.000000000 +0000 +++ juno-installer-0.4.0/juno-installer/generic/uninstall.sh 2024-03-29 12:06:26.000000000 +0000 @@ -7,7 +7,7 @@ #INSTALL FOR GNOME case "$product_model" in *) - apt purge --remove juno-brutus juno-drivers juno-ubuntu-drivers juno-fan-indicator clevo-keyboard clevo-keyboard-controller gnome-shell-extension-clevo-keyboard juno-nvidia-drivers juno-tablet -y; + apt purge --remove juno-brutus juno-drivers juno-ubuntu-drivers juno-fan-indicator clevo-keyboard clevo-keyboard-controller clevofan-dkms juno-nvidia-drivers juno-tablet -y; apt purge --remove *nvidia* -y; apt autoremove -y; apt autoclean; diff -Nru juno-installer-0.3.44/juno-installer/juno-installer juno-installer-0.4.0/juno-installer/juno-installer --- juno-installer-0.3.44/juno-installer/juno-installer 2024-03-17 08:01:52.000000000 +0000 +++ juno-installer-0.4.0/juno-installer/juno-installer 2024-03-29 12:37:31.000000000 +0000 @@ -33,10 +33,10 @@ ################################# version="$(apt-cache policy juno-installer | grep Candidate | awk '{print $2}')" product_model="$(sed -e 's/^\s*//g' -e 's/\s*$//g' "/sys/devices/virtual/dmi/id/product_name" | tr ' ,/-' '_')" +tablet="$(awk '{print substr($0,0,3);}' /sys/class/dmi/id/bios_version)" chassis="$(hostnamectl | awk 'FNR==3 {print $2}')" product_model1="$(dmidecode | grep -A3 '^Base Board Information' | grep 'Product Name' | awk '{print $3}')" nvidia="$(hwinfo --gfxcard | grep -oh -m 1 'nVidia')" -de="$(ps axf | grep -Po "env \.*[A-Z]+" | awk '{print $2}' | sort -u)" tablet="$(awk '{print substr($0,0,3);}' /sys/class/dmi/id/bios_version)" PS3='PLEASE ENTER YOUR CHOICE: ' options=("Install Juno Drivers" "Uninstall Juno Drivers" "Version" "Quit") @@ -261,37 +261,72 @@ "Install Juno Drivers") echo ""; echo "Installing Juno Drivers"; - echo ""; - case "$de" in - GNOME|gnome) - echo "$de Detected! Installing Drivers"; - echo ""; - sleep 1; - apt purge --remove *nvidia* -y; - apt autoremove -y; - apt update && apt dist-upgrade -y; - apt install -o Dpkg::Options::="--force-overwrite" linux-oem-latest -y; - sleep 3; - GNOME/install.sh - if [ $product_model1 == 'PF5NU1G' ]; then - apt install juno-ubuntu-drivers -y; - fi - ;; - *) - echo "$de Detected! Installing Drivers"; - echo ""; - sleep 1; - apt purge --remove *nvidia* -y; - apt autoremove -y; - apt update && apt dist-upgrade -y; - apt install -o Dpkg::Options::="--force-overwrite" linux-oem-latest -y; - sleep 3; - generic/install.sh - if [ $product_model1 == 'PF5NU1G' ]; then - apt install juno-drivers -y; - fi - ;; - esac + echo ""; + sleep 1; + apt purge --remove *nvidia* -y; + apt autoremove -y; + apt update && apt dist-upgrade -y; + + #Tab 2 + case "$DA217" in + NSA2513) + apt install -o Dpkg::Options::="--force-overwrite" juno-tablet -y; + ;; + esac + + # Tab 1 + case "$product_model" in + Default_string) + if [ $tablet = 'JP2' ]; then + apt install -o Dpkg::Options::="--force-overwrite" juno-tablet -y; + fi + ;; + # All Laptop & Desktop models + *) + apt install -o Dpkg::Options::="--force-overwrite" juno-drivers juno-fan-indicator clevofan-dkms clevo-keyboard clevo-keyboard-controller -y; + + # GNOME + GNOME/install.sh; + + # NVIDIA + NVIDIA/install.sh + ;; + esac + + # Models with DVD drives + case "$product_model" in + NJ5x_NJ7xLU|NJ5x_NJ7xCU|NJ50_70CU|NJx0MU|NJx0PU) + apt install libdvd-pkg -y; + dpkg-reconfigure libdvd-pkg + ;; + esac + + # Last checkup + sleep 1 + apt update; + apt dist-upgrade -y; + sleep 1 + apt dist-upgrade -y; + dpkg --configure -a; + apt autoremove -y; + + echo ""; + echo "INSTALLATION COMPLETE"; + echo "Would you like to restart?"; + select opt in "${options[@]}" + do + case $opt in + "Yes") + echo "Restaring now..." + reboot -f + break + ;; + "No") + break + ;; + esac +done + break ;; "Uninstall Juno Drivers")