Próba dostosowania bazowego pliku wersji do nowego sposobu wydawania immudex - mdrr

diff --git a/versions/base.sh b/versions/base.sh
index 17c49bc2817bd35581baeeb93211b6ab61588609..ed3b24dfcff08c57a335c6fb0b94b90e99aed7ec 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
 cd;
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex-testing;
-else apt install git -y && git clone https://github.com/xf0r3m/immudex-testing;
+if [ -x /usr/bin/git ]; then git clone https://git.morketsmerke.org/git/immudex-testing;
+else apt install git -y && git clone https://git.morketsmerke.org/git/immudex-testing;
 
 fi
-export VERSION=100;
 source ~/immudex-testing/versions/template.sh;
 
 echo "deb http://deb.debian.org/debian/ testing main" > /etc/apt/sources.list;
@@ -62,7 +61,7 @@ cp -vv ~/immudex-testing/tools/immudex-meteo /usr/local/bin;
 cp -vv ~/immudex-testing/tools/immudex-morketsmerke /usr/local/bin;
 cp -vv ~/immudex-testing/tools/immudex-motd2 /usr/local/bin;
 cp -vv ~/immudex-testing/tools/immudex-newsfeed /usr/local/bin;
-cp -vv ~/immudex-testing/tools/immudex-notifier /usr/local/bin;
+#cp -vv ~/immudex-testing/tools/immudex-notifier /usr/local/bin;
 cp -vv ~/immudex-testing/tools/immudex-padlock /usr/local/bin;
 cp -vv ~/immudex-testing/tools/immudex-pl /usr/local/bin;
 cp -vv ~/immudex-testing/tools/immudex-secured-firefox /usr/local/bin;
@@ -79,37 +78,41 @@ chmod +x /usr/local/bin/*;
 mkdir /etc/skel/.irssi
 
 cp -vv ~/immudex-testing/files/ /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}/terminalrc /etc/skel/.config/xfce4/terminal;
+cp -vv ~/immudex-testing/files/default.theme /etc/skel/.irssi;
+cp -rvv ~/immudex-testing/files/libreoffice /etc/skel/.config;
+cp -vv ~/immudex-testing/files/firejail.config /etc/firejail;
+#cp -vv ~/immudex-testing/files/Notifier\ -\ distro.desktop /etc/skel/.config/autostart;
+cp -vv ~/immudex-testing/files/redshift.conf /etc/skel/.config;
+cp -vv ~/immudex-testing/files/redshift.desktop /etc/skel/.config/autostart;
+cp -vv ~/immudex-testing/files/terminalrc /etc/skel/.config/xfce4/terminal;
+cp -vv ~/immudex-testing/files/xfce4-keyboard-shortcuts.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml
+cp -vv ~/immudex-testing/files/whiskermenu-1.rc /etc/skel/.config/xfce4/panel;
+cp -vv ~/immudex-testing/files/xfwm4.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml;
+
 # Instalacja MIME jest teraz częścią projektu 'xfcedebian'
 #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}/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 -rvv ~/immudex-testing/files/sync.sh /usr/share;
+cp -vv ~/immudex-testing/files/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
+cp -vv ~/immudex-testing/files/immudex_hostname.service /etc/systemd/system;
+
+tar -xzvf ~/immudex-testing/files/mozilla.tgz -C /etc/skel;
+#cp -vv ~/immudex-testing/images/${VERSION}/apply.png /usr/share/icons;
+cp -vv ~/immudex-testing/images/rss.png /usr/share/icons;
+cp -vv ~/immudex-testing/images/notes-background.jpg /usr/share/images/desktop-base;
 
-cp -vv ~/immudex-testing/launchers/${VERSION}/16844254192.desktop /etc/skel/.config/xfce4/panel/launcher-5;
+cp -vv ~/immudex-testing/launchers/16844254192.desktop /etc/skel/.config/xfce4/panel/launcher-5;
 
 systemctl enable immudex_hostname.service;
 
 cat >> /etc/bash.bashrc << EOL
 if [ ! -f /tmp/.motd ]; then
-/usr/local/bin/motd2
+/usr/local/bin/immudex-motd2
 touch /tmp/.motd;
 fi
 EOL
 
-echo "alias chhome='export HOME=\\\$(pwd)'" >> /etc/bash.bashrc;
-echo "alias ytstream='mpv --ytdl-format=best[heigth=480]'" >> /etc/bash.bashrc;
+echo "alias immudex-chhome='export HOME=\\\$(pwd)'" >> /etc/bash.bashrc;
 
 chmod u+s /usr/bin/ping;
 
@@ -123,7 +126,6 @@ echo "127.0.1.1   immudex" >> /etc/hosts;
 recreate_users;
 echo "user ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
 echo "xf0r3m ALL=(ALL:ALL) NOPASSWD:ALL" >> /etc/sudoers;
-set_notifier_packages;
 set_xfce4_notes_autostart;
 
 tidy;