Wdrożenie polityki antyfrankensteinowej. Do testów.

diff --git a/addons/lampstack b/addons/lampstack
index fbb123997c3730778dfab77f7e68685561b23896..7ef6240b567df81891515886a54b3522c59d482b 100644 (file)
--- a/addons/lampstack
+++ b/addons/lampstack
@@ -1,23 +1,28 @@
 #!/bin/bash
 
-baseVersion=$(head -1 /etc/apt/sources.list | awk '{print $3}')
+#Anti-Frankenstein policy - 13.05.2024
+if [ $DEBVER = "stable" ]; then
+  #baseVersion=$(head -1 /etc/apt/sources.list | awk '{print $3}')
 
-apt install lsb-release gnupg -y;
-wget https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb
-dpkg -i mysql-apt-config_0.8.29-1_all.deb;
+  apt install lsb-release gnupg -y;
+  wget https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb
+  dpkg -i mysql-apt-config_0.8.29-1_all.deb;
 
-sed -i "s/$baseVersion/bookworm/g" /etc/apt/sources.list;
+  #sed -i "s/$baseVersion/bookworm/g" /etc/apt/sources.list;
 
-apt update;
-apt install mysql-server -y
-apt-get install --fix-missing
-apt-mark hold libmecab2 libssl1.1 mecab-ipadic mecab-ipadic-utf8 mecab-utils mysql-client mysql-common mysql-community-client mysql-community-client-core mysql-community-client-plugins mysql-community-server mysql-community-server-core
+  apt update;
+  apt install mysql-server -y
+  apt-get install --fix-missing
+  apt-mark hold libmecab2 libssl1.1 mecab-ipadic mecab-ipadic-utf8 mecab-utils mysql-client mysql-common mysql-community-client mysql-community-client-core mysql-community-client-plugins mysql-community-server mysql-community-server-core
 
-sed -i "s/bookworm/$baseVersion/g" /etc/apt/sources.list; 
-apt update
-apt install apache2 libapache2-mod-php php php-mysql -y;
-apt autoremove;
-apt autoclean;
-apt clean;
+  #sed -i "s/bookworm/$baseVersion/g" /etc/apt/sources.list; 
+  apt update
+  apt install apache2 libapache2-mod-php php php-mysql -y;
+  apt autoremove;
+  apt autoclean;
+  apt clean;
 
-rm mysql-apt-config_0.8.29-1_all.deb;
+  rm mysql-apt-config_0.8.29-1_all.deb;
+else
+  exit 1;
+fi

diff --git a/addons/librewolf b/addons/librewolf
index b6bc175d3701ba30c7af23fed0e3381de40dfbb8..369f6930b5384a86492a6dc6799302346e75c1a9 100644 (file)
--- a/addons/librewolf
+++ b/addons/librewolf
@@ -1,15 +1,21 @@
 #!/bin/bash
 
 set -e 
+#Anti-Frankenstein policy - 13.05.2024
+if [ $DEBVER = "stable" ]; then
 
-if [ "$(uname -m)" != "x86_64" ]; then
-  echo "Other architectures than x86_64 (amd64) is not supported by this script";
+  if [ "$(uname -m)" != "x86_64" ]; then
+    echo "Other architectures than x86_64 (amd64) is not supported by this script";
+    exit 1;
+  fi 
+
+  wget https://deb.librewolf.net/pool/bookworm/ -O /tmp/index.html;
+  latestLink=$(grep -o '<a href=".*">' /tmp/index.html | sed 's/>/ /g' | cut -d " " -f 2 | sed -n '2,$p' | sed 's/"/ /g' | cut -d " " -f 2 | tail -1);
+  filename=$(basename $latestLink);
+
+  wget https://deb.librewolf.net${latestLink} -O /tmp/${filename};
+  apt install -y lsb-release libgdk-pixbuf2.0-0;
+  dpkg -i /tmp/${filename};
+else
   exit 1;
-fi 
-
-wget https://deb.librewolf.net/pool/bookworm/ -O /tmp/index.html;
-latestLink=$(grep -o '<a href=".*">' /tmp/index.html | sed 's/>/ /g' | cut -d " " -f 2 | sed -n '2,$p' | sed 's/"/ /g' | cut -d " " -f 2 | tail -1);
-filename=$(basename $latestLink);
-wget https://deb.librewolf.net${latestLink} -O /tmp/${filename};
-apt install -y lsb-release libgdk-pixbuf2.0-0;
-dpkg -i /tmp/${filename};
+fi

diff --git a/addons/ncspot b/addons/ncspot
index a09d14ff1dc3a54855d489e6b2aa16b57d0e8b7d..cdfca8ad61ef5840c3160359d0bd0bc788a182e2 100644 (file)
--- a/addons/ncspot
+++ b/addons/ncspot
@@ -1,17 +1,23 @@
 #!/bin/bash
-wget https://github.com/hrkfdn/ncspot/releases.atom
-ver=$(grep 'title' releases.atom | sed -n '2p' | sed -e 's,<title>,,g' -e 's,</title>,,g' -e 's,^[[:space:]]*,,g')
-sourceURL="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${ver}.tar.gz";
-wget $sourceURL
-tar -xf $(basename $sourceURL)
-cd ncspot-${ver}
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-sudo apt install libdbus-1-dev libncursesw5-dev libpulse-dev libssl-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev pkg-config build-essential -y
-$HOME/.cargo/bin/cargo build --release
-mv target/release/ncspot /usr/local/bin/
-if [ $? -eq 0 ]; then
-       cd ..;
-       rm -rf ncspot-${ver};
-       rm $(basename $sourceURL);
-       rm releases.atom;
+
+#Anti-Frankenstein policy - 13.05.2024
+if [ "$DEBVER" = "stable" ]; then
+  wget https://github.com/hrkfdn/ncspot/releases.atom
+  ver=$(grep 'title' releases.atom | sed -n '2p' | sed -e 's,<title>,,g' -e 's,</title>,,g' -e 's,^[[:space:]]*,,g')
+  sourceURL="https://github.com/hrkfdn/ncspot/archive/refs/tags/v${ver}.tar.gz";
+  wget $sourceURL
+  tar -xf $(basename $sourceURL)
+  cd ncspot-${ver}
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+  sudo apt install libdbus-1-dev libncursesw5-dev libpulse-dev libssl-dev libxcb1-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev pkg-config build-essential -y
+  $HOME/.cargo/bin/cargo build --release
+  mv target/release/ncspot /usr/local/bin/
+  if [ $? -eq 0 ]; then
+         cd ..;
+         rm -rf ncspot-${ver};
+         rm $(basename $sourceURL);
+         rm releases.atom;
+  fi
+else
+  exit 1;
 fi

diff --git a/addons/nushell b/addons/nushell
index 23c6b0c87fcc005b6efff3a2b6c6750b60b7b74a..7bc8adabcb4f97fda00ceefe1d2b61f40f61a769 100644 (file)
--- a/addons/nushell
+++ b/addons/nushell
@@ -1,17 +1,23 @@
 #!/bin/bash
-wget https://github.com/nushell/nushell/releases.atom
-ver=$(grep 'title' releases.atom | sed -n '2p' | sed -e 's,<title>,,g' -e 's,</title>,,g' -e 's,^[[:space:]]*,,g')
-sourceURL="https://github.com/nushell/nushell/archive/refs/tags/${ver}.tar.gz";
-wget $sourceURL
-tar -xf $(basename $sourceURL)
-cd nushell-${ver} 
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
-sudo apt install libssl-dev pkg-config build-essential -y
-$HOME/.cargo/bin/cargo build --release
-mv target/release/nu /usr/local/bin/
-if [ $? -eq 0 ]; then
+
+#Anti-Frankenstein policy - 13.05.2024
+if [ "$DEBVER" = "stable" ]; then
+  wget https://github.com/nushell/nushell/releases.atom
+  ver=$(grep 'title' releases.atom | sed -n '2p' | sed -e 's,<title>,,g' -e 's,</title>,,g' -e 's,^[[:space:]]*,,g')
+  sourceURL="https://github.com/nushell/nushell/archive/refs/tags/${ver}.tar.gz";
+  wget $sourceURL
+  tar -xf $(basename $sourceURL)
+  cd nushell-${ver} 
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+  sudo apt install libssl-dev pkg-config build-essential -y
+  $HOME/.cargo/bin/cargo build --release
+  mv target/release/nu /usr/local/bin/
+  if [ $? -eq 0 ]; then
         cd ..;
         rm -rf nushell-${ver};
         rm $(basename $sourceURL);
         rm releases.atom;
+  fi
+else
+  exit 1;
 fi

diff --git a/versions/base.sh b/versions/base.sh
index c00c3bf70184c6e5a09f66e36afe834eb3552ae3..03f0f62637f638a42e37282aea7d9aea5a4ae1e1 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -41,27 +41,32 @@ install_packages task-desktop task-xfce-desktop;
 install_packages firejail ufw cryptsetup lsof extlinux grub-efi-amd64 efibootmgr bash-completion etherwake wakeonlan cifs-utils wget figlet mpv 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 gimp openvpn netselect-apt gvfs-backends dnsutils lolcat make;
 
 #Missing packages
-if [ $DEBVER = "testing" ]; then
+#Anti-Frankenstein policy - 13.05.2024;
+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;
+  
+  #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;
+
+  #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 [ -f /usr/bin/youtube-dl ]; then rm /usr/bin/youtube-dl; fi
-ln -s /usr/bin/yt-dlp /usr/bin/youtube-dl;
 
 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>,,');
 wget https://github.com/yt-dlp/yt-dlp/releases/download/${ytdlpVer}/yt-dlp -O /usr/bin/yt-dlp
 
+#Anti-Frankenstein policy - 13.05.2024;
+ln -s /usr/bin/yt-dlp /usr/bin/youtube-dl;
+
 cd;
 
 git clone https://git.morketsmerke.org/git/xfcedebian-d13;
@@ -111,7 +116,12 @@ 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;
-cp -vv ~/immudex/files/gtk-main.css /usr/share/xfce4/notes/gtk-3.0/gtk.css;
+
+#Anti-Frankenstein policy - 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 [ -f /usr/share/applications/qmmp.desktop ]; then
   ln -s /usr/share/applications/qmmp.desktop /usr/share/applications/qmmp-1.desktop;
 fi
@@ -164,6 +174,8 @@ usermod -L root;
 
 # Miejsce na twoje zmiany, przed poleceniem 'tidy'
 
-bash ~/immudex/addons/librewolf
-#bash ~/immudex/addons/distrobox
+bash ~/immudex/addons/librewolf;
+bash ~/immudex/addons/ncspot;
+bash ~/immudex/addons/nushell;
+bash ~/immudex/addons/lampstack;
 tidy;