Dostosowanie pliku bazowego dla Debiana 13.

diff --git a/base.sh b/base.sh
index c5cee533959b1a3e7fc9a5ddb0121f8a8a83fac3..b7bcc779193a642c32c9f819d715bdace72d1ab6 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;
-  #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
+#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
+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;
 
@@ -106,7 +107,7 @@ cp -vv ~/immudex/tools/bin/immudex-autostart-x4notes /usr/local/bin;
 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 ~/X280/immudex-import-kdeconnect /usr/local/bin;
+#cp -vv ~/X280/immudex-import-kdeconnect /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;
@@ -117,11 +118,12 @@ cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin;
 wget https://ftp.morketsmerke.org/librewolf/immudex-secured-firefox -O /usr/local/bin/immudex-secured-firefox;
 cp -vv ~/immudex/tools/bin/immudex-shoutcasts /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-version /usr/local/bin;
+cp -vv ~/immudex/tools/bin/immudex-cdrip /usr/local/bin;
 
 #Wdrożenie projektu ytfzf - 12.05.2024;
-install_packages fzf jq ueberzug;
-git clone https://github.com/pystardust/ytfzf /tmp/ytfzf;
-(cd /tmp/ytfzf && make install doc)
+#install_packages fzf jq ueberzug;
+#git clone https://github.com/pystardust/ytfzf /tmp/ytfzf;
+#(cd /tmp/ytfzf && make install doc)
 
 cp -vv ~/immudex/tools/bin/library.sh /usr/local/bin;
 cp -vv ~/immudex/tools/bin/idle-clic /usr/local/bin;
@@ -134,7 +136,8 @@ 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 ~/X280/immudex-updates /usr/local/sbin;
+cp -vv ~/immudex/tools/sbin/immudex-updates /usr/local/sbin;
+#cp -vv ~/X280/immudex-updates /usr/local/sbin;
 chown root:root /usr/local/sbin/*;
 chmod 544 /usr/local/sbin/*;
 
@@ -148,7 +151,7 @@ cp -vv ~/X280/nextcloud.desktop /etc/skel/.config/autostart/nextcloud.desktop
 
 cp -rvv ~/immudex/files/sync.sh /usr/share;
 cp -vv ~/X280/org.keepassxc.KeePassXC.2.desktop /usr/share/applications/org.keepassxc.KeePassXC.2.desktop
-cp -vv ~/X280/sdrpp2.desktop /usr/share/applications/sdrpp2.desktop
+#cp -vv ~/X280/sdrpp2.desktop /usr/share/applications/sdrpp2.desktop
 cp -vv ~/X280/com.teamviewer.TeamViewer2.desktop /usr/share/applications/com.teamviewer.TeamViewer2.desktop
 
 if [ -f /usr/share/applications/qmmp.desktop ]; then
@@ -175,7 +178,7 @@ 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='less /run/live/medium/live/changelog'" >> /etc/bash.bashrc;
-echo "alias immudex-pt='firejail --net=none packettracer'" >> /etc/bash.bashrc;
+#echo "alias immudex-pt='firejail --net=none packettracer'" >> /etc/bash.bashrc;
 
 chmod u+s /usr/bin/ping;
 
@@ -223,10 +226,12 @@ usermod -L root;
 bash ~/immudex/addons/kvm;
 bash ~/X280/nextcloud;
 install_packages wireshark;
-bash ~/immudex/addons/chirp;
+usermod -aG wireshark $username;
+#bash ~/immudex/addons/chirp;
 bash ~/immudex/addons/iwlwifi;
 bash ~/immudex/addons/ncspot;
-bash ~/immudex/addons/lampstack;
+#bash ~/immudex/addons/lampstack;
+install_packages apache2 libapache2-mod-php php;
 bash ~/immudex/addons/realtek;
 cp -vv ~/X280/morketsmerke.nmconnection /etc/NetworkManager/system-connections/morketsmerke.nmconnection
 
@@ -244,8 +249,8 @@ MLDepsUrl="https://gitweb.morketsmerke.org/?p=ML.git;a=blob_plain;f=dependecies.
 install_packages $(curl "$MLDepsUrl" 2> /dev/null | awk '{printf $1" "}')
 
 cd /tmp
-git clone https://git.morketsmerke.org/git/backup
-bash backup/cisco_pt.sh
+#git clone https://git.morketsmerke.org/git/backup
+#bash backup/cisco_pt.sh
 
 git clone https://github.com/aristocratos/bashtop.git
 cd bashtop;
@@ -253,14 +258,14 @@ sudo make install;
 cd ..
 
 
-wget ftp.morketsmerke.org/~xf0r3m/X280/rtl_sdr_driver
-bash rtl_sdr_driver;
-rm -rf ~/rtl-sdr-blog;
+#wget ftp.morketsmerke.org/~xf0r3m/X280/rtl_sdr_driver
+#bash rtl_sdr_driver;
+#rm -rf ~/rtl-sdr-blog;
 usermod -aG plugdev xf0r3m
 
-install_packages libfftw3-dev libglfw3-dev libvolk2-dev librtaudio-dev libzstd-dev;
-wget https://github.com/AlexandreRouma/SDRPlusPlus/releases/download/nightly/sdrpp_debian_bookworm_amd64.deb;
-dpkg -i sdrpp_debian_bookworm_amd64.deb;
+#install_packages libfftw3-dev libglfw3-dev libvolk2-dev librtaudio-dev libzstd-dev;
+#wget https://github.com/AlexandreRouma/SDRPlusPlus/releases/download/nightly/sdrpp_debian_bookworm_amd64.deb;
+#dpkg -i sdrpp_debian_bookworm_amd64.deb;
 
 apt update;
 apt upgrade -y
@@ -270,12 +275,12 @@ wget https://download.teamviewer.com/download/linux/teamviewer_amd64.deb
 apt install -y ./teamviewer_amd64.deb
 kill $(pidof gpg-agent)
 
-install_packages kdeconnect kaccounts-providers;
-cp -vv ~/X280/ufw-setup.service /etc/systemd/system;
-systemctl enable ufw-setup.service;
+#install_packages kdeconnect kaccounts-providers;
+#cp -vv ~/X280/ufw-setup.service /etc/systemd/system;
+#systemctl enable ufw-setup.service;
 
-cp -vv ~/X280/ufw-setup /usr/local/sbin/ufw-setup;
-chmod +x /usr/local/sbin/ufw-setup;
+#cp -vv ~/X280/ufw-setup /usr/local/sbin/ufw-setup;
+#chmod +x /usr/local/sbin/ufw-setup;
 
 rm -rf ~/X280