Dostosowanie plików wersji oraz szablonu do immudex wersji stable

diff --git a/versions/100.sh b/versions/100.sh
index c17cde02f3399ff18e3cca2782c4be6549dd2b58..d599ab3b1393fd5b1429f95d64e5f92fa0a198b6 100644 (file)
--- a/versions/100.sh
+++ b/versions/100.sh
@@ -23,12 +23,12 @@ fi
 export VERSION=$VERSION;
 source ~/immudex/versions/template.sh;
 
-echo "deb http://deb.debian.org/debian/ bullseye main" > /etc/apt/sources.list;
-echo "deb-src http://deb.debian.org/debian/ bullseye  main" >> /etc/apt/sources.list;
-echo "deb http://security.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list;
-echo "deb-src http://security.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list;
-echo "deb http://deb.debian.org/debian/ bullseye-updates main" >> /etc/apt/sources.list;
-echo "deb-src http://deb.debian.org/debian/ bullseye-updates main" >> /etc/apt/sources.list;
+echo "deb http://deb.debian.org/debian/ stable main" > /etc/apt/sources.list;
+echo "deb-src http://deb.debian.org/debian/ stable main" >> /etc/apt/sources.list;
+echo "deb http://security.debian.org/debian-security stable-security main" >> /etc/apt/sources.list;
+echo "deb-src http://security.debian.org/debian-security stable-security main" >> /etc/apt/sources.list;
+echo "deb http://deb.debian.org/debian/ stable-updates main" >> /etc/apt/sources.list;
+echo "deb-src http://deb.debian.org/debian/ stable-updates main" >> /etc/apt/sources.list;
 update_packages;
 
 
@@ -50,7 +50,7 @@ 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 youtube-dl 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 thunderbird gimp openvpn netselect-apt gvfs-backends;
 
 head -1 /etc/apt/sources.list | tee /etc/apt/sources.list.d/xfce4-notes-plugin.list;
-sed -i 's/bullseye/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
+sed -i 's/stable/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
 apt update;
 apt install xfce4-notes-plugin -y;
 rm /etc/apt/sources.list.d/xfce4-notes-plugin.list;
@@ -64,30 +64,29 @@ bash install.sh;
 
 cd;
 
-cp -vv ~/immudex-testing/tools/${VERSION}/* /usr/local/bin;
+cp -vv ~/immudex/tools/${VERSION}/* /usr/local/bin;
 chmod +x /usr/local/bin/*;
 
 mkdir /etc/skel/.irssi
 
-cp -vv ~/immudex-testing/files/${VERSION}/config /etc/skel/.irssi;
-cp -vv ~/immudex-testing/files/${VERSION}/default.theme /etc/skel/.irssi;
-cp -rvv ~/immudex-testing/files/${VERSION}/libreoffice /etc/skel/.config;
-cp -vv ~/immudex-testing/files/${VERSION}/firejail.config /etc/firejail;
-cp -vv ~/immudex-testing/files/${VERSION}/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
-cp -vv ~/immudex-testing/files/${VERSION}/redshift.conf /etc/skel/.config;
-cp -vv ~/immudex-testing/files/${VERSION}/redshift.desktop /etc/skel/.config/autostart;
-cp -vv ~/immudex-testing/files/${VERSION}/Klient\ poczty\ Thunderbird.desktop /etc/skel/Pulpit;
-cp -vv ~/immudex-testing/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
-cp -vv ~/immudex-testing/files/${VERSION}/mimeapps.list /etc/skel/.config;
-cp -rvv ~/immudex-testing/files/${VERSION}/sync.sh /usr/share;
-cp -vv ~/immudex-testing/files/${VERSION}/conkyrc /etc/skel/.conkyrc;
-cp -vv ~/immudex-testing/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
-cp -vv ~/immudex-testing/files/${VERSION}/immudex_hostname.service /etc/systemd/system;
-
-tar -xzvf ~/immudex-testing/files/${VERSION}/mozilla.tgz -C /etc/skel;
-cp -vv ~/immudex-testing/images/${VERSION}/apply.png /usr/share/icons;
-cp -vv ~/immudex-testing/images/${VERSION}/rss.png /usr/share/icons;
-cp -vv ~/immudex-testing/images/${VERSION}/notes-background.jpg /usr/share/images/desktop-base;
+cp -vv ~/immudex/files/${VERSION}/config /etc/skel/.irssi;
+cp -vv ~/immudex/files/${VERSION}/default.theme /etc/skel/.irssi;
+cp -rvv ~/immudex/files/${VERSION}/libreoffice /etc/skel/.config;
+cp -vv ~/immudex/files/${VERSION}/firejail.config /etc/firejail;
+cp -vv ~/immudex/files/${VERSION}/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
+cp -vv ~/immudex/files/${VERSION}/redshift.conf /etc/skel/.config;
+cp -vv ~/immudex/files/${VERSION}/redshift.desktop /etc/skel/.config/autostart;
+cp -vv ~/immudex/files/${VERSION}/Klient\ poczty\ Thunderbird.desktop /etc/skel/Pulpit;
+cp -vv ~/immudex/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
+cp -vv ~/immudex/files/${VERSION}/mimeapps.list /etc/skel/.config;
+cp -vv ~/immudex/files/${VERSION}/conkyrc /etc/skel/.conkyrc;
+cp -vv ~/immudex/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
+cp -vv ~/immudex/files/${VERSION}/immudex_hostname.service /etc/systemd/system;
+
+tar -xzvf ~/immudex/files/${VERSION}/mozilla.tgz -C /etc/skel;
+cp -vv ~/immudex/images/${VERSION}/apply.png /usr/share/icons;
+cp -vv ~/immudex/images/${VERSION}/rss.png /usr/share/icons;
+cp -vv ~/immudex/images/${VERSION}/notes-background.jpg /usr/share/images/desktop-base;
 
 rm /usr/share/images/desktop-base/no_trespass_abandon.jpeg;
 systemctl enable immudex_hostname.service;

diff --git a/versions/template.sh b/versions/template.sh
index d7da708d52a1d874f0b7c5d1561cfc4f42073350..8a968b0c17565e320efb69d50c8b125806cf3e0b 100644 (file)
--- a/versions/template.sh
+++ b/versions/template.sh
@@ -19,7 +19,7 @@ function recreate_users() {
     cp -rvv /etc/skel/.??* /home/user;
     cp -rvv /etc/skel/?* /home/user;
     mkdir /home/user/.local;
-    tar -xvf ~/immudex-testing/files/${VERSION}/local_user.tar -C /home/user/.local;
+    tar -xvf ~/immudex/files/${VERSION}/local_user.tar -C /home/user/.local;
     rm /home/user/.face;
     cp /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /home/user/.face;
     chown -R user:user /home/user;
@@ -31,7 +31,7 @@ function recreate_users() {
     cp -rvv /etc/skel/.??* /home/xf0r3m;
     cp -rvv /etc/skel/?* /home/xf0r3m;
     mkdir /home/xf0r3m/.local;
-    tar -xvf ~/immudex-testing/files/${VERSION}/local_xf0r3m.tar -C /home/xf0r3m/.local;
+    tar -xvf ~/immudex/files/${VERSION}/local_xf0r3m.tar -C /home/xf0r3m/.local;
     rm /home/xf0r3m/.face;
     cp /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /home/xf0r3m/.face;
     chown -R xf0r3m:xf0r3m /home/xf0r3m;
@@ -49,7 +49,7 @@ function tidy() {
   apt-get clean;
   apt-get autoremove -y;
   apt-get autoclean;
-  rm -rf ~/immudex-testing;
+  rm -rf ~/immudex;
   if [ -d ~/xfcedebian ]; then rm -rf ~/xfcedebian; fi
   rm /var/cache/apt/*.bin;
   echo > ~/.bash_history;
@@ -62,12 +62,12 @@ function set_default_wallpaper() {
 }
 
 function set_notifier_packages() {
-  cp -vv ~/immudex-testing/files/${VERSION}/Notifier\ -\ packages.desktop /home/xf0r3m/.config/autostart;
+  cp -vv ~/immudex/files/${VERSION}/Notifier\ -\ packages.desktop /home/xf0r3m/.config/autostart;
   chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/Notifier\ -\ packages.desktop;
 }
 
 function set_xfce4_notes_autostart() {
-  cp -vv ~/immudex-testing/files/${VERSION}/autostart-x4notes.desktop /home/xf0r3m/.config/autostart;
+  cp -vv ~/immudex/files/${VERSION}/autostart-x4notes.desktop /home/xf0r3m/.config/autostart;
   chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/autostart-x4notes.desktop;
 }