Usunięcie czynności nie potrzebnych w nowej wersji immudex-testing (opartej na Debian...

diff --git a/files/100/Klient poczty Thunderbird.desktop b/files/100/Klient poczty Thunderbird.desktop
deleted file mode 100755 (executable)
index 899d137..0000000
--- a/files/100/Klient poczty Thunderbird.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=Klient poczty Thunderbird
-Comment=Czytanie i wysyłanie e-maili
-Exec=/usr/local/bin/run-thunderbird
-Icon=thunderbird
-Path=
-Terminal=false
-StartupNotify=true

diff --git a/files/100/local_user.tar b/files/100/local_user.tar
deleted file mode 100644 (file)
index 8445bef..0000000
Binary files a/files/100/local_user.tar and /dev/null differ

diff --git a/files/100/local_xf0r3m.tar b/files/100/local_xf0r3m.tar
deleted file mode 100644 (file)
index a3645bc..0000000
Binary files a/files/100/local_xf0r3m.tar and /dev/null differ

diff --git a/versions/100.sh b/versions/100.sh
index 5988a24ec2acc86919aa36dd9a70c4f4bc4e4bc5..26c205917bd54b5d9f591bbbe2e70cc9943bc8e5 100644 (file)
--- a/versions/100.sh
+++ b/versions/100.sh
@@ -76,7 +76,6 @@ 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;

diff --git a/versions/template.sh b/versions/template.sh
index ed38e022701d724b2d04df5ba85e9e85d53bdfb8..bef27368fea35ee90325d385ae197311a638354a 100644 (file)
--- a/versions/template.sh
+++ b/versions/template.sh
@@ -17,20 +17,12 @@ function recreate_users() {
   useradd -m -s /bin/bash user;
   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;
-  #rm /home/user/.face;
-  #cp /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /home/user/.face;
   chown -R user:user /home/user;
   echo "user:user1" | chpasswd;
 
   useradd -m -s /bin/bash xf0r3m;
   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;
-  #rm /home/xf0r3m/.face;
-  #cp /usr/share/images/desktop-base/immudex_xfce_greeter_logo.png /home/xf0r3m/.face;
   chown -R xf0r3m:xf0r3m /home/xf0r3m;
   echo "xf0r3m:xf0r3m1" | chpasswd;