Zapisanie zmian dla wersji b3.0-1

diff --git a/base.sh b/base.sh
index eddd6e108de4632716f0c78194db735014229aac..8b780d135e4a61f809eebf047ad5f0416de42184 100644 (file)
--- a/base.sh
+++ b/base.sh
@@ -12,11 +12,11 @@ else
 fi
 
 cd;
-if [ -x /usr/bin/git ]; then
+if [ -x /usr/bin/git ]; then 
   git clone https://git.morketsmerke.org/git/immudex;
   git clone https://git.morketsmerke.org/git/H270;
 else 
-  apt install git -y
+  apt install git -y;
   git clone https://git.morketsmerke.org/git/immudex;
   git clone https://git.morketsmerke.org/git/H270;
 fi
@@ -43,12 +43,18 @@ dpkg-reconfigure console-setup;
 install_packages task-desktop task-xfce-desktop;
 
 #Usunięcie pakietów make oraz gimp - 22.11.2025;
-install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet vim-gtk3 redshift irssi nmap nfs-common remmina python3-pip ffmpeg debootstrap squashfs-tools xorriso syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools chrony python3-venv isolinux rsync mutt openvpn netselect-apt gvfs-backends dnsutils lolcat cdparanoia icedax thunderbird nextcloud-desktop extrepo;
+install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet vim-gtk3 redshift irssi nmap nfs-common remmina python3-pip ffmpeg debootstrap squashfs-tools xorriso syslinux-efi grub-pc-bin grub-efi-amd64-bin mtools dosfstools chrony python3-venv isolinux rsync mutt openvpn netselect-apt gvfs-backends dnsutils lolcat cdparanoia icedax nextcloud-desktop thunderbird mc minicom extrepo;
 
 extrepo enable librewolf;
 apt update;
 install_packages librewolf;
 
+cd;
+
+git clone https://github.com/xf0r3m/xfcedebian;
+cd xfcedebian;
+bash install.sh --immudex;
+
 if [ -f /usr/bin/youtube-dl ]; then rm /usr/bin/youtube-dl; fi
 
 ytdlpVer=$(curl https://github.com/yt-dlp/yt-dlp/releases.atom 2>/dev/null | grep '<title>.*</title>$' | sed -n '2p' | sed 's/\ /\n/g' | tail -1 | sed 's,</title>,,');
@@ -58,109 +64,56 @@ wget https://github.com/yt-dlp/yt-dlp/releases/download/${ytdlpVer}/yt-dlp -O /u
 ln -s /usr/bin/yt-dlp /usr/bin/youtube-dl;
 
 cd;
+wget https://ftp.morketsmerke.org/youtube-search/python3-youtube-search_2.2.0.deb
+apt install ./python3-youtube-search_2.2.0.deb -y
 
-git clone https://github.com/xf0r3m/xfcedebian;
-cd xfcedebian;
-bash install.sh --immudex;
+git clone https://git.morketsmerke.org/git/immudex-tools;
+cp -vv ~/immudex-tools/bin/* /usr/local/bin;
 
-cd;
-
-#Wyłączenie narzędzia immudex-autostart-x4notes - 22.11.2025
-cp -vv ~/immudex/tools/bin/immudex-branch /usr/local/bin;
-cp -vv ~/immudex/tools/bin/immudex-import-gpgkeys /usr/local/bin;
-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 ~/immudex/tools/bin/immudex-motd2 /usr/local/bin;
-cp -vv ~/immudex/tools/bin/immudex-padlock /usr/local/bin;
-#cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin;
-cp -vv ~/immudex/tools/bin/immudex-secured-librewolf /usr/local/bin;
-#Wyłączenie narzędzia immudex-protected - 22.11.2025
-#cp -vv ~/immudex/tools/bin/immudex-shoutcasts /usr/local/bin;
-cp -vv ~/immudex/tools/bin/immudex-version /usr/local/bin;
-#Nowe narzędzie immudex-cdrip - 27.08.2025;
-#cp -vv ~/immudex/tools/bin/immudex-cdrip /usr/local/bin;
-#Wyłaczenie immudex-run - 22.11.2025
-cp -vv ~/immudex/tools/bin/immudex-run /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;
+git clone https://git.morketsmerke.org/git/immudex-only-tools;
+cp -vv ~/immudex-only-tools/bin/* /usr/local/bin;
 chmod +x /usr/local/bin/*;
 
-#cp -vv ~/immudex/tools/sbin/immudex-create-media /usr/local/sbin;
-#cp -vv ~/immudex/tools/sbin/immudex-crypt /usr/local/sbin;
-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;
-#Wyłączenie narzędzi immudex-update i immudex-nf - 22.11.2025
+cp -vv ~/immudex-tools/sbin/* /usr/local/sbin;
+cp -vv ~/immudex-only-tools/sbin/* /usr/local/sbin;
 chown root:root /usr/local/sbin/*;
 chmod 544 /usr/local/sbin/*;
 
-wget https://ftp.morketsmerke.org/morketsmerke-keyring.asc -O /usr/share/keyrings/morketsmerke-keyring.asc
-echo "deb [signed-by=/usr/share/keyrings/morketsmerke-keyring.asc] http://ftp.morketsmerke.org/debian trixie main" | tee /etc/apt/sources.list.d/morketsmerke.list
-
-apt update
-apt install immudex-tools -y
-
-ln -s /usr/bin/immudex-motd /usr/local/bin/immudex-motd2;
+cp -vv ~/immudex-tools/misc/motd.conf /etc/motd.conf;
+cp -vv ~/immudex-only-tools/misc/immudex-hostname.service /etc/systemd/system;
+systemctl enable immudex-hostname.service;
 
 cp -rvv ~/immudex/files/libreoffice /etc/skel/.config;
 cp -vv ~/immudex/files/firejail.config /etc/firejail;
 cp -vv ~/immudex/files/redshift.conf /etc/skel/.config;
 cp -vv ~/immudex/files/redshift.desktop /etc/skel/.config/autostart;
 
-#cp -rvv ~/immudex/files/sync.sh /usr/share;
-
-#Polityka antyfrankensteinowa - 13.05.2024
-if [ "$DEBVER" = "testing" ]; then 
-  cp -vv ~/immudex/files/gtk-main.css /usr/share/xfce4/notes/gtk-3.0/gtk.css;
-fi
-
 if [ -h /usr/share/applications/qmmp-1.desktop ]; then
   rm /usr/share/applications/qmmp-1.desktop;
 fi
 
-if [ -f /usr/share/applications/com.nextcloud.desktopclient.nextcloud.desktop ]; then
-  rm /usr/share/applications/com.nextcloud.desktopclient.nextcloud.desktop;
-fi
-
 cp -vv ~/immudex/launchers/*.desktop /usr/share/applications;
+cp -vv ~/H270/launchers/*.desktop /usr/share/applications;
 cp -vv ~/immudex/files/whiskermenu-1.rc /etc/skel/.config/xfce4/panel/whiskermenu-1.rc;
-cp -vv ~/H270/displays.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
-cp -rvv ~/H270/launchery/panel /etc/skel/.config/xfce4;
-cp -vv ~/H270/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 
-#cp -vv ~/immudex/files/immudex_hostname.service /etc/systemd/system;
+cp -vv ~/H270/displays_b2.1.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml
+cp -rvv ~/H270/launchery/panel /etc/skel/.config/xfce4;
+cp -vv ~/H270/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml;
+cp -vv ~/H270/bashrc /etc/skel/.bashrc;
 
 cp -vv ~/immudex/launchers/16844254192.desktop /etc/skel/.config/xfce4/panel/launcher-5;
-cp -vv ~/H270/bashrc /etc/skel/.bashrc;
 
 tar -xzvf ~/immudex/files/mozilla.tgz -C /etc/skel;
 
-wget https://ftp.morketsmerke.org/librewolf/librewolf.tgz -O /tmp/librewolf.tgz;
-tar -xzvf /tmp/librewolf.tgz -C /etc/skel;
-
-#systemctl enable immudex_hostname.service;
 
 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
 
 echo "alias immudex-chhome='export HOME=\$(pwd)'" >> /etc/bash.bashrc;
-echo "alias immudex-changelogs='immudex-upgrade --check --print'" >> /etc/bash.bashrc;
 echo "alias immudex-version='cat /run/live/medium/live/changelog'" >> /etc/bash.bashrc;
 
 chmod u+s /usr/bin/ping;
@@ -193,12 +146,12 @@ usermod -L root;
 
 # Miejsce na twoje zmiany, przed poleceniem 'tidy'
 cd /tmp
-wget https://download.teamviewer.com/download/linux/teamviewer_amd64.deb
+wget https://download.teamviewer.com/download/linux/teamviewer_amd64.deb;
 apt install -y ./teamviewer_amd64.deb
 kill $(pidof gpg-agent)
 
+bash ~/immudex/addons/nvidiaLatest;
 bash ~/immudex/addons/ncspot;
-bash ~/immudex/addons/realtek;
 bash ~/immudex/addons/kvm;
 
 cp -vv ~/H270/oh-my-posh-install.sh /tmp/oh-my-posh-install.sh;

diff --git a/changelog b/changelog
new file mode 100644 (file)
index 0000000..12c4bc6
--- /dev/null
+++ b/changelog
@@ -0,0 +1 @@
+b3.0-1:        immudex-only-tools: Dostosowanie immudex-padlock do zmienionej wersji immudex-crypt.

diff --git a/template.sh b/template.sh
index 8b8248b7b0e57a2db2f667a617567dba17322319..e61188c54952e6ef5f504b9934016c351d24ab9a 100644 (file)
--- a/template.sh
+++ b/template.sh
@@ -39,6 +39,9 @@ function tidy() {
   apt-get autoremove -y;
   apt-get autoclean;
   rm -rf ~/immudex;
+  rm -rf ~/immudex-tools;
+  rm -rf ~/immudex-only-tools;
+  rm ~/python3-youtube-search*.deb;
   if [ -d ~/xfcedebian ]; then rm -rf ~/xfcedebian; fi
   rm /var/cache/apt/*.bin;
   echo > ~/.bash_history;
@@ -69,6 +72,10 @@ function make_changelog_file() {
   echo "COMMIT=\"${COMMIT}\"" >> $FILE;
   echo "ADDONS=\"${ADDONS}\"" >> $FILE;
   echo "-== Diffrences in version file ==-" >> $FILE;
-  cp ${HOME}/immudex/versions/base.sh ${HOME}/H270/base.sh; 
+  cp ${HOME}/immudex/versions/base.sh ${HOME}/H270/base.sh;
   (cd ${HOME}/H270; git diff base.sh) >> $FILE;
+  if [ -f ${HOME}/immudex/versions/changelog ]; then
+    echo "-== User custom changelog ==-" >> $FILE;
+    cat ${HOME}/immudex/versions/changelog >> $FILE;
+  fi
 }