b2.5 - Usunięcie autostartu nextcloud-a oraz nadmiarowych aktywatorów programów.

diff --git a/base.sh b/base.sh
index fd1ab38604e5668bd2f822d0ad6ed9c2fd81d642..3e20a0771f81da9f0d444135268a9a2b004289a7 100644 (file)
--- a/base.sh
+++ b/base.sh
@@ -126,9 +126,14 @@ 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;
+if [ -h /usr/share/applications/qmmp-1.desktop ]; then
+  rm /usr/share/applications/qmmp-1.desktop;
 fi
+
+if [ -f /usr/share/applications/com.nextcloud.desktopclient.nextcloud.desktop ]; then
+  rm /usr/share/applications/com.nextcloud.desktopclient.nextcloud.desktop;
+fi
+
 cp -vv ~/immudex/launchers/*.desktop /usr/share/applications;
 cp -vv ~/immudex/files/whiskermenu-1.rc /etc/skel/.config/xfce4/panel/whiskermenu-1.rc;
 cp -vv ~/X270/pointers.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
@@ -178,9 +183,6 @@ chown -R ${username}:${username} /home/${username};
 passwd $username;
 usermod -aG sudo $username;
 
-if [ -f /home/${username}/.config/autostart/Nextcloud.desktop ]; then
-  rm /home/${username}/.config/autostart/Nextcloud.desktop;
-fi
 
 dd if=/dev/random bs=1M of=random count=1;
 rootPassword=$(md5sum random | awk '{printf $1}');

diff --git a/template.sh b/template.sh
new file mode 100644 (file)
index 0000000..da1de0e
--- /dev/null
+++ b/template.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+function update_packages() {
+  apt update;
+  apt upgrade -y;
+}
+
+function install_packages() {
+  apt install $@ -y;
+}
+
+function set_xfce4_notes_autostart() {
+  cp -vv ~/immudex/files/autostart-x4notes.desktop /home/xf0r3m/.config/autostart;
+  chown xf0r3m:xf0r3m /home/xf0r3m/.config/autostart/autostart-x4notes.desktop;
+}
+
+
+function recreate_users() {
+  useradd -m -s /bin/bash user;
+  cp -rvv /etc/skel/.??* /home/user;
+  chown -R user:user /home/user;
+  echo "user:user1" | chpasswd;
+
+  useradd -m -s /bin/bash xf0r3m;
+  cp -rvv /etc/skel/.??* /home/xf0r3m;
+  chown -R xf0r3m:xf0r3m /home/xf0r3m;
+  echo "xf0r3m:xf0r3m1" | chpasswd;
+  set_xfce4_notes_autostart
+
+  usermod -aG libvirt,libvirt-qemu xf0r3m;
+  usermod -aG libvirt,libvirt-qemu user;
+
+  echo "root:toor" | chpasswd;
+}
+
+function tidy() {
+  apt-get clean;
+  apt-get clean;
+  apt-get autoremove -y;
+  apt-get autoclean;
+  rm -rf ~/immudex;
+  if [ -d ~/xfcedebian ]; then rm -rf ~/xfcedebian; fi
+  rm /var/cache/apt/*.bin;
+  echo > ~/.bash_history;
+  history -c   
+}
+
+function set_default_wallpaper() {
+  rm /usr/share/images/desktop-base/default;
+  ln -s /usr/share/images/desktop-base/$1 /usr/share/images/desktop-base/default;
+}
+
+function make_changelog_file() {
+  ARCH=$1;
+  DEBVER=$debver;
+  COMPILATION_DATE=$(date);
+  COMMIT=$(cd ${HOME}/X270 && git log --pretty=oneline | head -1);
+  ADDONS=$(grep 'bash ~/immudex/addons' ${HOME}/immudex/versions/base.sh | grep -v '^#' | cut -d "/" -f4 | sed 's/;//g' | awk '{printf $1" "}');
+
+  echo "ARCH=\"${ARCH}\"" > $FILE;
+  echo "DEBVER=\"${DEBVER}\"" >> $FILE;
+  if [ "$cname" ]; then
+    echo "CANONICAL_NAME=\"${cname}\"" >> $FILE;
+  fi
+  if [ "$version" ]; then
+    echo "VERSION=\"${version}\"" >> $FILE;
+  fi
+  echo "COMPILATION_DATE=\"${COMPILATION_DATE}\"" >> $FILE;
+  echo "COMMIT=\"${COMMIT}\"" >> $FILE;
+  echo "ADDONS=\"${ADDONS}\"" >> $FILE;
+  echo "-== Diffrences in version file ==-" >> $FILE;
+  cp ${HOME}/immudex/versions/base.sh ${HOME}/X270/base.sh; 
+  (cd ${HOME}/X270; git diff base.sh) >> $FILE;
+}