Aktualizacja plików hosta do najnowszej wersji projektu immudex.

diff --git a/base.sh b/base.sh
index 6e41a97a55f07bcd55c2874cd239b2aa81f3d316..1b4977460a8f27118c86bcd1e3aec0196bf7dbaf 100644 (file)
--- a/base.sh
+++ b/base.sh
@@ -97,7 +97,7 @@ cd;
 
 git clone https://github.com/xf0r3m/xfcedebian;
 cd xfcedebian;
-bash install.sh;
+bash install.sh --immudex;
 
 cd;
 
@@ -111,13 +111,16 @@ 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 ~/X280/immudex-motd2 /usr/local/bin/immudex-motd2;
-cp -vv ~/X280/immudex-run /usr/local/bin/immudex-run;
+#cp -vv ~/X280/immudex-run /usr/local/bin/immudex-run;
 
-if [ "$DEBVER" = "oldstable" ]; then
-  cp -vv ~/X280/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
-elif [ "$DEBVER" = "stable" ]; then
-  cp -vv ~/X280/immudex-nextcloud-d13 /usr/local/bin/immudex-nextcloud;
-fi
+#if [ "$DEBVER" = "oldstable" ]; then
+#  cp -vv ~/X280/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
+#elif [ "$DEBVER" = "stable" ]; then
+#  cp -vv ~/X280/immudex-nextcloud-d13 /usr/local/bin/immudex-nextcloud;
+#fi
+mkdir -p /usr/local/share/immudex-run;
+cp -vv ~/X280/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;
@@ -131,6 +134,17 @@ cp -vv ~/immudex/tools/bin/immudex-cdrip /usr/local/bin;
 #git clone https://github.com/pystardust/ytfzf /tmp/ytfzf;
 #(cd /tmp/ytfzf && make install doc)
 
+#Włączenie z powrotem immudex-ytplay - 27.08.2025;
+#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;
@@ -251,17 +265,17 @@ mv /root/.cache/oh-my-posh /usr/share;
 rm /tmp/oh-my-posh-install.sh;
 cp -vv ~/X280/immudex-nu.omp.json.nu-deploy /usr/share/oh-my-posh/immudex-nu.omp.json;
 cd
-MLDepsUrl="https://gitweb.morketsmerke.org/?p=ML.git;a=blob_plain;f=dependecies.txt;hb=5e30c5b6d7f490bfdfffaa2cff615dc794534f8a";
-install_packages $(curl "$MLDepsUrl" 2> /dev/null | awk '{printf $1" "}')
+#MLDepsUrl="https://gitweb.morketsmerke.org/?p=ML.git;a=blob_plain;f=dependecies.txt;hb=5e30c5b6d7f490bfdfffaa2cff615dc794534f8a";
+#install_packages $(curl "$MLDepsUrl" 2> /dev/null | awk '{printf $1" "}')
 
-cd /tmp
+#cd /tmp
 #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/X280/rtl_sdr_driver

diff --git a/immudex-run.base b/immudex-run.base
new file mode 100644 (file)
index 0000000..b9b39fe
--- /dev/null
+++ b/immudex-run.base
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+NATIVE_HOME_DIR="/home/${USER}";
+WORKING_HOME_DIR="/ic0";
+
+APPS=("nextcloud" "keepassxc");
+CONFIG_DIRS=(".config/Nextcloud,.cache/Nextcloud,.local/share/Nextcloud" ".config/keepassxc,.cache/keepassxc");