diff -Nru juno-info-0.1.14/debian/changelog juno-info-0.2.6/debian/changelog --- juno-info-0.1.14/debian/changelog 2020-09-01 08:01:52.000000000 +0000 +++ juno-info-0.2.6/debian/changelog 2022-07-07 08:01:52.000000000 +0000 @@ -1,5 +1,5 @@ -juno-info (0.1.14-2) focal; urgency=low +juno-info (0.2.6-1) jammy; urgency=low - * Bug Fix + * NEW: Neptune v4 & Gemini v4 - -- Juno Tue, 1 Sep 2020 08:01:52 +0000 + -- Juno Thu, 7 Jul 2022 08:01:52 +0000 diff -Nru juno-info-0.1.14/juno-info juno-info-0.2.6/juno-info --- juno-info-0.1.14/juno-info 2020-09-01 08:01:52.000000000 +0000 +++ juno-info-0.2.6/juno-info 2022-07-07 08:01:52.000000000 +0000 @@ -2,28 +2,37 @@ # Author: Juno Computers Ltd. - Giovanni Caligaris # https://junocomputers.com +SUDO_USER=whoami + if [ "$(id -u)" -ne 0 ]; then exec sudo su -c "bash '$(basename $0)'" fi -SUDO_USER=whoami + os="$(lsb_release -sd)" osversion="$(lsb_release -sc)" chassis="$(hostnamectl | awk 'FNR==3 {print $2}')" -product_model="$(sed -e 's/^\s*//g' -e 's/\s*$//g' "/sys/devices/virtual/dmi/id/product_name" | tr ' ,/-' '_')" #N130BU, N131BU, N130WU, N131WU, N13xWU, N141WU, N14xWU, N240GU, N240WU, NUC7i3BNH, NUC7i5BNH, NUC7i7BNH +product_model="$(sed -e 's/^\s*//g' -e 's/\s*$//g' "/sys/devices/virtual/dmi/id/product_name" | tr ' ,/-' '_')" processor="$(dmidecode -s processor-version | head -1)" -bios="$(dmidecode -s bios-version)" +cpucores="$(cat /proc/cpuinfo | egrep "core id|physical id" | tr -d "\n" | sed s/physical/\\nphysical/g | grep -v ^$ | sort | uniq | wc -l)" +bios="$(cat /sys/class/dmi/id/bios_version)" +ec="$(cat /sys/class/dmi/id/ec_firmware_release)" checkdrive="$(lsblk -io KNAME | grep nvme0n1p1 | sort -u)" ssdnvme="$(if [ $checkdrive = 'nvme0n1p1' ]; then echo "nvme0n1"; else echo "sda"; fi)" nvmesize="$(cat /sys/class/block/nvme0n1/queue/hw_sector_size | sort -u)" -ssdsize="$(cat /sys/class/block/sda/queue/hw_sector_size | sort -u)" +ssdsize="$(if [ -d /sys/class/block/sda/queue/hw_sector_size ]; then cat /sys/class/block/sda/queue/hw_sector_size | sort -u; fi)" -ssdmodel="$(cat /sys/block/sda/device/model)" +ssdmodel="$(if [ -d /sys/block/sda/device/model ]; then cat /sys/block/sda/device/model; fi)" nvmemodel="$(cat /sys/block/nvme0n1/device/model)" kernel="$(uname -r)" -ram="$(free -t -g | grep -oP '\d+' | sed '10!d')" +ram="$(free -g | grep "Mem" | awk '{print $2}')" +ramspeed="$(dmidecode --type memory | grep "Speed" | head -n 1 | awk '{for(i=2;i<=NF;i++){printf $i" "}print ""}')" +ddr="$(dmidecode --type memory | grep "DDR" | awk '{for(i=2;i<=NF;i++){printf $i" "}print ""}')" +product_model1="$(dmidecode | grep -A3 '^Base Board Information' | grep 'Product Name' | awk '{print $3}')" +gpu="$(lshw -numeric -C display | grep "product" | awk '{for(i=2;i<=NF;i++){printf $i" "}print ""}')" + echo "############################" echo "" @@ -31,82 +40,171 @@ echo "" echo -n "Your system:"; case "$product_model" in N130BU|N131BU|N130WU|N131WU|N13xWU|N13xZU) - echo " Jupiter 13 ($chassis)" + echo " Jupiter 13 ($product_model)" ;; N140BU|N141BU|N140WU|N141WU|N14xWU) - echo " Jupiter 14 ($chassis)" + echo " Jupiter 14 ($product_model)" ;; - N140ZU|N141ZU|N14xZU) - echo " Jupiter 14 v2 ($chassis)" + N140ZU|N141ZU|N14xZU|N13_N140ZU|N140ZU|N141ZU) + echo " Jupiter 14 v2 ($product_model)" ;; N140CU|N141CU|N14xCU) - echo " Jupiter 14 v3 ($chassis)" + echo " Jupiter 14 v3 ($product_model)" + ;; + NV4XMZ|NV4XMB_ME_MZ) + echo " Jupiter 14 v4 ($product_model)" + ;; + NV4XMJ_MK_MH) + echo " Jupiter 14 PRO v2 ($product_model)" ;; N150ZU|N151ZU|N15xZU) - echo " Gemini 15 ($chassis)" + echo " Gemini 15 ($product_model)" ;; N150CU|N151CU|N15xCU) - echo " Gemini 15 v2 ($chassis)" + echo " Gemini 15 v2 ($product_model)" + ;; + NS50MU|NS50_70MU) + echo " Gemini v3 ($product_model)" ;; - N240GU|N240WU) - echo " Nyx 14 ($chassis)" + NS5x_NS7xPU) + echo " Gemini v4 ($product_model)" ;; - NL40GU|NL41GU|NL4xGU|NL40_50CU) - echo " Nyx 14 v2 ($chassis)" + N240GU|N240WU|N24_25GU) + echo " Nyx 14 ($product_model)" + ;; + NL40GU|NL41GU|NL4xGU|NL40_50GU) + echo " Nyx 14 ($product_model)"; ;; NL40CU|NL41CU|NL4xCU|NL40_50CU) - echo " Nyx 14 v2 ($chassis)" + if [ $(juno-display | grep '13.9' | awk '{print $2}') == 13.9 ]; then + echo " Nyx 14 v2 ($product_model)"; + fi + if [ $(juno-display | grep '14.0' | awk '{print $2}') == 14.0 ]; then + echo " Nyx 14 v2 ($product_model)"; + fi + if [ $(juno-display | grep '15.5' | awk '{print $2}') == 15.5 ]; then + echo " Nyx 15 v1 ($product_model)"; + fi + ;; + NL4x_NL5xLU) + if [ $(juno-display | grep '13.9' | awk '{print $2}') == 13.9 ]; then + echo " Nyx 14 v3 ($product_model)"; + fi + if [ $(juno-display | grep '15.5' | awk '{print $2}') == 15.5 ]; then + echo " Nyx 15 v2 ($product_model)"; + fi + ;; + NLx0MU) + if [ $(juno-display | grep '13.9' | awk '{print $2}') == 13.9 ]; then + echo " Nyx 14 v4 ($product_model)"; + fi + if [ $(juno-display | grep '15.5' | awk '{print $2}') == 15.5 ]; then + echo " Nyx 15 v3 ($product_model)"; + fi + ;; + NL50RU|NL51RU|NL5xRU|NL4x_NL5xRU) + echo " Nyx 15 AMD ($product_model)" + ;; + NL50NU|NL51NU|NL5xNU|NL4x_NL5xNU) + echo " Nyx 15 AMD v2 ($product_model)" + ;; + NJ5x_NJ7xLU|NJ5x_NJ7xCU|NJ50_70CU) + echo " Nyx 17 ($product_model)" + ;; + NJx0MU) + echo " Nyx 17 v2 ($product_model)" ;; Juve) - echo " Juve ($chassis)" + echo " Juve ($product_model)" ;; Juve1) - echo " Juve v2 ($chassis)" + echo " Juve v2 ($product_model)" ;; NUC7i3BNH|NUC7i5BNH|NUC7i7BNH) - echo " Olympia 7th Gen ($chassis)" + echo " Olympia 7th Gen ($product_model)" ;; NUC8i3BEH|NUC8i5BEH|NUC8i7BEH) - echo " Olympia 8th Gen ($chassis)" + echo " Olympia 8th Gen ($product_model)" ;; NUC10i3FNH|NUC10i5FNH|NUC10i7FNH) - echo " Olympia 10th Gen ($chassis)" + echo " Olympia 10th Gen ($product_model)" ;; To_Be_Filled_By_O.E.M.) if [ "$(dmidecode -s processor-version | grep -Po 'AMD')" == 'AMD' ]; then - echo " Brutus ($chassis)"; + echo " Brutus ($product_model)"; elif [ "$(dmidecode -s processor-version | grep -Po 'N4000')" == 'N4000' ]; then - echo " Juve v1 ($chassis)"; + echo " Juve v1 ($product_model)"; elif [ "$(dmidecode -s processor-version | grep -Po 'N3350')" == 'N3350' ]; then - echo " Juve v2 ($chassis)"; + echo " Juve v2 ($product_model)"; fi ;; + TB_4000) + echo " Brutus 4000 ($product_model)" + ;; + SYSTEM_PRODUCT_NAME) + echo " Brutus 5000 v2 ($product_model)" + ;; To_be_filled_by_O.E.M.) if [ "$(dmidecode -s processor-version | grep -Po 'N4000')" == 'N4000' ]; then - echo " Juve v1 ($chassis)"; + echo " Juve v1 ($product_model)"; elif [ "$(dmidecode -s processor-version | grep -Po 'N3350')" == 'N3350' ]; then - echo " Juve v2 ($chassis)"; + echo " Juve v2 ($product_model)"; fi ;; PCX0DX) - if [ "juno-display | grep '17.3' | awk '{print $2}'" == '17.3' ]; then - echo " Neptune 17 ($chassis)"; - fi - if [ "juno-display | grep '15.6' | awk '{print $2}'" == '15.6' ]; then - echo " Neptune 15 ($chassis)"; - fi + echo " Neptune v1 ($product_model)" ;; - *) - echo " Model not recognized ($chassis)" + PCx0Dx) + echo " Neptune v2 ($product_model)" ;; -esac + PC5x_7xHP_HR_HS) + echo " Neptune v3 ($product_model)" + ;; + PD5x_7xPNP_PNR_PNN_PNT|PD5x_7xPNP_PNN_PNT) + echo " Neptune v4 ($product_model)" + ;; + NP50DE_DB) + echo " Saturn 15 ($product_model)" + ;; + NP50D5) + echo " Saturn 15 v2 ($product_model)" + ;; + NP5x_NP7xHH_HJ_HK) + echo " Saturn 15 v3 ($product_model)" + ;; + NH5x_7xDPx) + echo " Saturn 17 ($product_model)" + ;; + NP5x_NP6x_NP7xHP) + echo " Saturn 17 v2 ($product_model)" + ;; + NH5xVR) + echo " Mars 15 ($product_model)" + ;; + NP5x_NP6x_NP7xPNK_PNH_PNJ|NP5x_NP6x_NP7xPNP) + echo " Saturn 15 v4 ($product_model)" + ;; + Default_string) + echo " Mercury ($product_model)" + ;; + *) + if [ $product_model1 == 'PF5NU1G' ]; then + echo " Aurora 15 ($product_model)"; + else + echo " Model not recognized ($product_model)"; + fi + ;; + esac echo "" echo "------------------------" echo "OS: $os $osversion" echo "Kernel: $kernel" echo "Bios Version: $bios" +echo "EC Version: $ec" echo "------------------------" echo "Processor: $processor" +echo "CPU Cores: $cpucores" +echo "GPU: $gpu" echo -n "SSD Model:"; case "$ssdnvme" in nvme0n1) echo " $nvmemodel" @@ -131,7 +229,7 @@ echo " $((ssdsize/2))GB" ;; esac -echo "RAM: $((ram))GB" +echo "RAM: $((ram))GB $ramspeed $ddr" echo "------------------------" echo "" echo " Linux For The Masses "