Aktualizacja pliku bazowego zgodnie z najnowszą wersją immudex.

diff --git a/base.sh b/base.sh
index cd5c258b64febe74ce296af710832a46b9f71df3..3a55d9a9d29567301ee24e53d3c97795b77d3023 100644 (file)
--- a/base.sh
+++ b/base.sh
@@ -70,21 +70,22 @@ update-alternatives --remove x-www-browser /usr/bin/firefox-esr;
 update-alternatives --install /usr/bin/x-www-browser x-www-browser /usr/bin/librewolf 70;
 
 #Missing packages
-if [ $DEBVER = "testing" ]; then
-  install_packages xfce4-notes-plugin yt-dlp;
-  head -1 /etc/apt/sources.list | sed "s/${DEBVER}/stable/" > /etc/apt/sources.list.d/stable.list;
-  apt update;
-  install_packages newsboat;
-  rm /etc/apt/sources.list.d/stable.list;
-  apt update;
-else
-  install_packages newsboat;
+#if [ $DEBVER = "testing" ]; then
+#  install_packages xfce4-notes-plugin yt-dlp;
+#  head -1 /etc/apt/sources.list | sed "s/${DEBVER}/stable/" > /etc/apt/sources.list.d/stable.list;
+#  apt update;
+#  install_packages newsboat;
+#  rm /etc/apt/sources.list.d/stable.list;
+#  apt update;
+#else
+#  install_packages newsboat;
   #head -1 /etc/apt/sources.list | sed "s/${DEBVER}/testing/" > /etc/apt/sources.list.d/testing.list;
   #apt update;
   #install_packages xfce4-notes-plugin yt-dlp;
   #rm /etc/apt/sources.list.d/testing.list;
   #apt update;
-fi
+#fi
+install_packages newsboat;
 if [ -f /usr/bin/youtube-dl ]; then rm /usr/bin/youtube-dl; fi
 #ln -s /usr/bin/yt-dlp /usr/bin/youtube-dl;
 
@@ -110,17 +111,22 @@ cp -vv ~/immudex/tools/bin/immudex-import-sshkeys /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-meteo /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-morketsmerke /usr/local/bin;
 cp -vv ~/l-tc-n50s/immudex-motd2 /usr/local/bin/immudex-motd2;
-cp -vv ~/l-tc-n50s/immudex-run /usr/local/bin/immudex-run;
+#cp -vv ~/l-tc-n50s/immudex-run /usr/local/bin/immudex-run;
 
 #Na Debianie 13 Nextcloud przestał łapać konfigurację przy ustawionej zmiennej
 #HOME. Zaszła potrzeba zmiany lokalizacji konfiguracji do natywnego katalogu
 #domowego (/home/user), mimo to Nextcloud zapisuje wszystko na /ic0, tak jak
 #konfiguruje go skrypt.
-if [ "$DEBVER" = "oldstable" ]; then
-  cp -vv ~/l-tc-n50s/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
-elif [ "$DEBVER" = "stable" ]; then
-  cp -vv ~/l-tc-n50s/immudex-nextcloud-d13 /usr/local/bin/immudex-nextcloud;
-fi
+#if [ "$DEBVER" = "oldstable" ]; then
+#  cp -vv ~/l-tc-n50s/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
+#elif [ "$DEBVER" = "stable" ]; then
+#  cp -vv ~/l-tc-n50s/immudex-nextcloud-d13 /usr/local/bin/immudex-nextcloud;
+#fi
+#Wykorzystanie narzędzia włączonego do immudex-run - 26.09.2025
+#Nowe narzędzie immudex-run - 14.09.2025;
+mkdir -p /usr/local/share/immudex-run;
+cp -vv ~/l-tc-n50s/immudex-run.base /usr/local/share/immudex-run/immudex-run.base;
+cp -vv ~/immudex/tools/bin/immudex-run /usr/local/bin;
 
 cp -vv ~/immudex/tools/bin/immudex-padlock /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin;
@@ -137,7 +143,16 @@ cp -vv ~/immudex/tools/bin/immudex-cdrip /usr/local/bin;
 #Wyłączenie projektu ytfzf - 27.08.2025 (projekt jest martwy);
 
 #Włączenie z powrotem immudex-ytplay - 27.08.2025;
-cp -vv ~/immudex/tools/bin/immudex-ytplay /usr/local/bin;
+#cp -vv ~/immudex/tools/bin/immudex-ytplay /usr/local/bin;
+#Właczenie nowej wersji immudex-ytplay (immudex-ytplay2) - 13.09.2025
+pythonVersion=$(python3 -V | awk '{printf $2}' | cut -d "." -f 1-2);
+mv /usr/lib/python${pythonVersion}/EXTERNALLY-MANAGED /usr/lib/python${pythonVersion}/EXTERNALLY-MANAGED.old;
+wget https://ftp.morketsmerke.org/youtube-search/youtube_search-2.1.2-py3-none-any.whl -O /tmp/youtube_search-2.1.2-py3-none-any.whl;
+pip install /tmp/youtube_search-2.1.2-py3-none-any.whl;
+mv /usr/lib/python${pythonVersion}/EXTERNALLY-MANAGED.old /usr/lib/python${pythonVersion}/EXTERNALLY-MANAGED;
+cp -vv ~/immudex/tools/bin/immudex-ytplay2 /usr/local/bin;
+ln -s /usr/local/bin/immudex-ytplay2 /usr/local/bin/immudex-ytplay;
+
 cp -vv ~/immudex/tools/bin/library.sh /usr/local/bin;
 cp -vv ~/immudex/tools/bin/idle-clic /usr/local/bin;
 cp -vv ~/immudex/tools/bin/sync.sh /usr/local/bin;
@@ -149,7 +164,7 @@ cp -vv ~/immudex/tools/sbin/immudex-hostname /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-install /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-upgrade /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-nf /usr/local/sbin;
-cp -vv ~/l-tc-n50s/immudex-updates /usr/local/sbin;
+cp -vv ~/immudex/tools/sbin/immudex-updates /usr/local/sbin;
 chown root:root /usr/local/sbin/*;
 chmod 544 /usr/local/sbin/*;
 
@@ -242,7 +257,7 @@ usermod -L root;
 bash ~/immudex/addons/kvm;
 bash ~/l-tc-n50s/nextcloud;
 install_packages wireshark;
-bash ~/immudex/addons/chirp;
+#bash ~/immudex/addons/chirp;
 bash ~/immudex/addons/iwlwifi;
 bash ~/immudex/addons/ncspot;
 #bash ~/immudex/addons/lampstack;
@@ -267,10 +282,10 @@ cd
 #git clone https://git.morketsmerke.org/git/backup
 #bash backup/cisco_pt.sh
 
-git clone https://github.com/aristocratos/bashtop.git
-cd bashtop;
-sudo make install;
-cd ..
+#git clone https://github.com/aristocratos/bashtop.git
+#cd bashtop;
+#sudo make install;
+#cd ..
 
 
 #wget ftp.morketsmerke.org/~xf0r3m/l-tc-n50s/rtl_sdr_driver