From 090acbb32bd4aba10f45eae7308ffee77238bfde Mon Sep 17 00:00:00 2001 From: xf0r3m Date: Sat, 25 Apr 2026 11:32:19 +0200 Subject: [PATCH] =?utf8?q?Dostosowanie=20do=20wersji=203.0=20cz.3.=20Usuni?= =?utf8?q?=C4=99cie=20b=C5=82=C4=99d=C3=B3w=20w=20narz=C4=99dziach.=20Doda?= =?utf8?q?nie=20mo=C5=BCliwo=C5=9Bci=20zmiany=20rozmiaru=20partycji=20w=20?= =?utf8?q?immudex-install=20bez=20potrzeby=20edycji=20kodu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- tools/bin/immudex-meteo | 4 ++-- tools/bin/immudex-pl | 14 ++++++++++---- tools/man/immudex-install.1.gz | Bin 992 -> 1112 bytes tools/man/immudex-meteo.1.gz | Bin 957 -> 955 bytes tools/man/immudex-pl.1.gz | Bin 1086 -> 1084 bytes tools/sbin/immudex-install | 27 +++++++++++++++++---------- versions/base.sh | 5 +++-- 7 files changed, 32 insertions(+), 18 deletions(-) diff --git a/tools/bin/immudex-meteo b/tools/bin/immudex-meteo index 9a0c6c0..9fbefb5 100755 --- a/tools/bin/immudex-meteo +++ b/tools/bin/immudex-meteo @@ -23,7 +23,7 @@ function help() { } function version() { - echo "immudex-meteo 1.0"; + echo "immudex-meteo 1.0-1"; echo; echo "Copyright (C) 2026 morketsmerke.org"; echo "This is free software; see the source for copying conditions. There is NO"; @@ -34,7 +34,7 @@ function version() { if [ "$1" ]; then case $1 in - "--short") curl wttr.in/${2}?format=2\&lang=pl;; + "--short") curl wttr.in/${2}?0\&lang=pl;; "--long") curl wttr.in/${2}?lang=pl;; "--micro") curl wttr.in/${2}?format=4;; "--help") help; exit 0;; diff --git a/tools/bin/immudex-pl b/tools/bin/immudex-pl index fa9e196..e6dce63 100755 --- a/tools/bin/immudex-pl +++ b/tools/bin/immudex-pl @@ -2,6 +2,7 @@ GREEN="\e[32m"; RED="\e[31m"; +YELLOW="\e[33m"; ENDCOLOR="\e[0m"; SYSTEM_CC=$(echo $LANG | cut -c 1-2); @@ -33,7 +34,7 @@ function help() { } function version() { - echo "immudex-pl 1.0"; + echo "immudex-pl 1.0-1"; echo; echo "Copyright (C) 2026 morketsmerke.org"; echo "This is free software; see the source for copying conditions. There is NO"; @@ -106,15 +107,20 @@ if [ "$file" ]; then echo "Getting high quality audio stream format..."; audio=$(yt-dlp --list-formats $link 2>/dev/null | grep 'audio only' | grep "high" | sed -n '1p' | awk '{printf $1}'); if [ ! "$audio" ]; then - echo "No audio stream found...[ ${RED}DEAD${ENDCOLOR} ]"; - exit 1; + echo -e "No audio stream found...[ ${RED}FAILED${ENDCOLOR} ]"; + echo -e "There is no separate audio stream...[ ${YELLOW}FINE${ENDCOLOR} ]"; + #exit 1; else echo -e "Getting high quality audio stream format...[ ${GREEN}OK${ENDCOLOR} ]"; fi else echo -e "Getting audio format based on your locales...[ ${GREEN}OK${ENDCOLOR} ]"; fi - fmat="--ytdl-format=${video}+${audio}"; + if [ ! "$audio" ]; then + fmat="--ytdl-format=${video}"; + else + fmat="--ytdl-format=${video}+${audio}"; + fi echo "MPV is starting up..."; mpv $fmat $link > /dev/null 2>&1 & MPVPID=$! diff --git a/tools/man/immudex-install.1.gz b/tools/man/immudex-install.1.gz index 13ad22fe40ea2cb95ae1ca5fe24ba06f5955d760..960837c3780e689b64841d57ee0282eb983c5082 100644 GIT binary patch literal 1112 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 diff --git a/tools/man/immudex-pl.1.gz b/tools/man/immudex-pl.1.gz index 80506dfccfe7e10485ca22f5ab6e9c6224b34e17..e75ec4aba08da2389699b84b21259b1dce55ea09 100644 GIT binary patch literal 1084 zcmV-C1jG9uiwFn@i0o+q18Hq-b!26DEpTiuF#vT{O>g5i6uk3Sy!w;{BH2k6ix%4y zbsQxYU|WJDV>hUJpe5QOB9Q_~`Qx&`y^oZfc+>Wf57KlV69Ozu{bCX@1z+Go`r{!>-%3eR#GHx9NI$4ANN=##tDx&UA9iNB##H zAJRhc)Z_q)qWi$`8V(gNDpH{28|GkO&nYzR9;Uqh-*A^8OI|jD#4J}>?o~ap_ zib2sS#e@MV7;ufqysq6jWa`7W3a_;wf}wYe1a{;G%&BES1@^~`K^t(P4WlKGei{9f+HDxJ9v>@)}aOqOY9mD%XUX=EgeI`1>y;2KvCqW0ZVixJ5x|?Q0ojE zev=gjJxh5IwWK9Bh+f1c)5KnSZW)hgBNZ;BaFh*IJG`P~dtR`25iRkOAtfga*;<9D zaTQEBa@=SXfEArV6ZO80oK4WSSxoZnL+<6hSJ6u_tb5Pm#=SG#rFWfei493l3zO=q z{YyOOW3*P`-1MN(O(ptF+*`5^NRVc3` zWaq}24t6{4v>NLQEjTV^F}{eyxc9${Fgwzwt(m12lb~N*Jd~BPM-RSFm+|?6%WVA^ zyBE*B9@QL8FUyYa&*C^JROqJ&{0r#q1>jx#`@1ib7W}b|nZy5I?7kACzHnI7+f`^$ZW|=X698)=Fhy)9tkN;P3t6KX(n~wO`2Q z4_7ve;+G_Ro@Zoseg?>|3hCx9G#G1Ubi?qEFV&9t8$~kv{@e~xhQ5|tbHKOx3YztC z*0NItb6K-5YsXa~MaiuTFhDjz$_0HD5v){HnA2C6QD()kb;}@`&8Mqu`VcO{?8RpA zDa=+uieD;G0#k^m$aJ<|OcRLLNgSoYAVL}hFkPh4h}fWRI~yojbT|@CZ$pItFyO73 zDY_MZY<}@|A;TGi*2R6%(HeUWw=R&j5cdhX_5(<(|+i9ts50Xm*gKkqp)v>2LJ$2 CqzaV) literal 1086 zcmV-E1i||siwFqT$8c!?18Hq-b!26DEpTiuF#vT{O>g5i5WVwPOnu4%vFs#^MT>2U zI*t;nur0xou^Uu9&=MsPkw}50{Bh}T?~sxcZ`vM`m=n(9%$xVdUOIxu5Y}M=tMD;+ zdVypS#PAd>{ht5=0|%<1WP&MbSPr`rRIF}q8!F(&`}~V{=MgViK(JbEAN}v+XbGd6 z5sdzzqNC~rx6|7%c;rpfFBp-{4MAMuwqp39A2)?pL}G4USY9fJIs7D0MF9`AY1B#g&}R1G!vx1XnN zI!TL-=XvhN&GhFX@)w+QY?~iKd!{s(Vu-q+tz&HKa6wngqaV*VL6ijH`rJ-x`;q_A zj0bV1cxxb24Efd2FwuSJ@EQ&k&nl83Khp{m3ua<=CgdneI0o-=I85km^g z5H&7?3D+Dq8VO)oXHZ1FZbK&%lx-4`w0KCzX|Gk(5)9{FvlzH{g1gkNlP$3(>Dxl5 zx@_+f&*>PY87X83%i&gJTGNvKaP6$^x0_t_FJlns4oQUJ$~Dl=R7kC*E0gU>@v=gC zT|;(noZG=_C!JOkU7-Xgxy&XPc9`_~cNS(x+O##ZZAHZI4;O>7RQBlp_t`2sKXB=- zzb9_u>9|KVN7K_%^8J|{2Zap%V1a)Dy-fh#xxc^rGHt<|SerTg|HbYz(Mm3(&+aRq zZIeZ~A>R~7$qTzikHu8oHT{1_8$Sv+Nw9u~hwXDbA{*99WnkBp+G_CE{_^i-LwW6G zviZ%W&BN$r6Fe^xGCz+2(yL6mtqTp>ni<_N{NqVg5^twSV&~885@o1sS(pRP<|}B{ z+gZy_Wz2caPS&ogOp2Ua6`+BvgOoG+IwY8>s4%Cm&ZEqdVe?l0X1>+_39@>-Aq;#0#P`?j@iXMa1r%I(H&*8<1uhy3P)B0BGH+7^)=y0GP&aaEAu~ E06K;ZhyVZp diff --git a/tools/sbin/immudex-install b/tools/sbin/immudex-install index fc07577..f89411d 100755 --- a/tools/sbin/immudex-install +++ b/tools/sbin/immudex-install @@ -13,25 +13,28 @@ function help() { echo "GB. It would happens. More space in this partition is also needed for"; echo "upgrades tasks. So if your image is bigger than 2 GiB, you need to "; echo "change size of this partition before you start instalation."; - echo "Recomended size is 3 times the image size."; + echo "Recomended size is 3 times the image size. The partition size can be"; + echo "changed via below described option."; echo "This script requires superuser (root) privileges."; echo; - echo "Usage: immudex-install [--help] [--version]"; + echo "Usage: immudex-install [--partition-size=3G] [--help] [--version]"; echo; echo "Options:"; - echo " --help Print this message."; - echo " --version Print information about version, author and copyrights."; + echo " --partition-size=3G This option change a partition size with immudex image. Usefull for custom builds. By default it's 3GB."; + echo " --help Print this message."; + echo " --version Print information about version, author and copyrights."; echo; echo "Examples:"; - echo " immudex-install Standard execution, instalation immudex LiveCD on computer hard disk."; - echo " immudex-install --help Print this message."; - echo " immudex-install --version Print information about version, author and copyrights."; + echo " immudex-install Standard execution, instalation immudex LiveCD on computer hard disk."; + echo " immudex-install --partition-size=6G Run install script for custom immudex image build."; + echo " immudex-install --help Print this message."; + echo " immudex-install --version Print information about version, author and copyrights."; echo; echo "Report bugs to "; } function version() { - echo "immudex-install 1.0"; + echo "immudex-install 1.1"; echo; echo "Copyright (C) 2026 morketsmerke.org"; echo "This is free software; see the source for copying conditions. There is NO"; @@ -46,6 +49,10 @@ if [ "$1" ]; then help; elif [ "$1" = "--version" ]; then version; + elif $(echo $1 | grep -q "--partition-size"); then + idxPartSize=$(echo $1 | cut -d "=" -f2); + else + idxPartSize="3G"; fi else if [ $UID -ne 0 ]; then @@ -90,7 +97,7 @@ if $(sudo efibootmgr > /dev/null 2>&1); then parted /dev/$disk mklabel msdos > /dev/null 2>&1; parted /dev/$disk mkpart primary 1 101M > /dev/null 2>&1; parted /dev/$disk set 1 boot on > /dev/null 2>&1; - parted /dev/$disk mkpart primary 101M 3G > /dev/null 2>&1; + parted /dev/$disk mkpart primary 101M $idxPartSize > /dev/null 2>&1; if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi @@ -150,7 +157,7 @@ else dd if=/dev/zero bs=1M of=/dev/$disk count=1 2> /dev/null parted /dev/$disk mklabel msdos > /dev/null 2>&1; - parted /dev/$disk mkpart primary 1 3G > /dev/null 2>&1; + parted /dev/$disk mkpart primary 1 $idxPartSize > /dev/null 2>&1; parted /dev/$disk set 1 boot on > /dev/null 2>&1; if $(echo $disk | egrep -qo "mmc|nvme"); then disk="${disk}p"; fi diff --git a/versions/base.sh b/versions/base.sh index 6760007..2d390ed 100644 --- a/versions/base.sh +++ b/versions/base.sh @@ -66,7 +66,8 @@ cp -vv ~/immudex/tools/sbin/* /usr/local/sbin; chown root:root /usr/local/sbin/*; chmod 544 /usr/local/sbin/*; -cp -vv ~/immudex/tools/misc/motd.conf /etc/motd.conf; +mkdir /usr/share/doc/immudex-motd; +cp -vv ~/immudex/tools/misc/motd.conf /usr/share/doc/immudex-motd/motd.conf; cp -vv ~/immudex/tools/misc/immudex-hostname.service /etc/systemd/system; systemctl enable immudex-hostname.service; @@ -90,7 +91,7 @@ tar -xf ~/immudex/files/mozilla.tgz -C /etc/skel; cat >> /etc/bash.bashrc << EOL if [ ! -f /tmp/.motd ]; then -/usr/local/bin/immudex-motd2 +/usr/local/bin/immudex-motd touch /tmp/.motd; fi EOL -- 2.39.5