Poprawienie plików dla latitude-7420.

diff --git a/base.sh b/base.sh
index fcece927ba1d866214a7d4499bc7260c9fd8efe4..beef63fd02d0dae78722e95d196e1a9a19c1db0c 100644 (file)
--- a/base.sh
+++ b/base.sh
@@ -14,11 +14,11 @@ fi
 cd;
 if [ -x /usr/bin/git ]; then 
        git clone https://github.com/xf0r3m/immudex;
-       git clone https://git.morketsmerke.org/git/latitude-7240;
+       git clone https://git.morketsmerke.org/git/latitude-7420;
 else 
        apt install git -y;
        git clone https://github.com/xf0r3m/immudex;
-       git clone https://git.morketsmerke.org/git/latitude-7240;
+       git clone https://git.morketsmerke.org/git/latitude-7420;
 
 fi
 source ~/immudex/versions/template.sh;
@@ -45,10 +45,10 @@ echo -n "Europe/Warsaw" > /etc/timezone;
 rm /etc/localtime;
 ln -s /usr/share/zoneinfo/Europe/Warsaw /etc/localtime;
 
-cp -vv ~/latitude-7240/locale.gen /etc;
-cp -vv ~/latitude-7240/locale /etc/default;
-cp -vv ~/latitude-7240/keyboard /etc/default;
-cp -vv ~/latitude-7240/console-setup /etc/default; 
+cp -vv ~/latitude-7420/locale.gen /etc;
+cp -vv ~/latitude-7420/locale /etc/default;
+cp -vv ~/latitude-7420/keyboard /etc/default;
+cp -vv ~/latitude-7420/console-setup /etc/default; 
 /usr/sbin/locale-gen;
 
 install_packages task-desktop task-xfce-desktop;
@@ -106,12 +106,12 @@ cp -vv ~/immudex/tools/bin/immudex-autostart-x4notes /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-branch /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-import-gpgkeys /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-import-sshkeys /usr/local/bin;
-cp -vv ~/latitude-7240/immudex-import-kdeconnect /usr/local/bin;
+cp -vv ~/latitude-7420/immudex-import-kdeconnect /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-meteo /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-morketsmerke /usr/local/bin;
-cp -vv ~/latitude-7240/immudex-motd2 /usr/local/bin/immudex-motd2;
-cp -vv ~/latitude-7240/immudex-run /usr/local/bin/immudex-run;
-cp -vv ~/latitude-7240/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
+cp -vv ~/latitude-7420/immudex-motd2 /usr/local/bin/immudex-motd2;
+cp -vv ~/latitude-7420/immudex-run /usr/local/bin/immudex-run;
+cp -vv ~/latitude-7420/immudex-nextcloud /usr/local/bin/immudex-nextcloud;
 cp -vv ~/immudex/tools/bin/immudex-padlock /usr/local/bin;
 cp -vv ~/immudex/tools/bin/immudex-pl /usr/local/bin;
 wget https://ftp.morketsmerke.org/librewolf/immudex-secured-firefox -O /usr/local/bin/immudex-secured-firefox;
@@ -134,7 +134,7 @@ cp -vv ~/immudex/tools/sbin/immudex-hostname /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-install /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-upgrade /usr/local/sbin;
 cp -vv ~/immudex/tools/sbin/immudex-nf /usr/local/sbin;
-cp -vv ~/latitude-7240/immudex-updates /usr/local/sbin;
+cp -vv ~/latitude-7420/immudex-updates /usr/local/sbin;
 chown root:root /usr/local/sbin/*;
 chmod 544 /usr/local/sbin/*;
 
@@ -144,12 +144,12 @@ cp -rvv ~/immudex/files/libreoffice /etc/skel/.config;
 cp -vv ~/immudex/files/firejail.config /etc/firejail;
 cp -vv ~/immudex/files/redshift.conf /etc/skel/.config;
 cp -vv ~/immudex/files/redshift.desktop /etc/skel/.config/autostart;
-cp -vv ~/latitude-7240/nextcloud.desktop /etc/skel/.config/autostart/nextcloud.desktop
+cp -vv ~/latitude-7420/nextcloud.desktop /etc/skel/.config/autostart/nextcloud.desktop
 
 cp -rvv ~/immudex/files/sync.sh /usr/share;
-cp -vv ~/latitude-7240/org.keepassxc.KeePassXC.2.desktop /usr/share/applications/org.keepassxc.KeePassXC.2.desktop
-cp -vv ~/latitude-7240/sdrpp2.desktop /usr/share/applications/sdrpp2.desktop
-cp -vv ~/latitude-7240/com.teamviewer.TeamViewer2.desktop /usr/share/applications/com.teamviewer.TeamViewer2.desktop
+cp -vv ~/latitude-7420/org.keepassxc.KeePassXC.2.desktop /usr/share/applications/org.keepassxc.KeePassXC.2.desktop
+cp -vv ~/latitude-7420/sdrpp2.desktop /usr/share/applications/sdrpp2.desktop
+cp -vv ~/latitude-7420/com.teamviewer.TeamViewer2.desktop /usr/share/applications/com.teamviewer.TeamViewer2.desktop
 
 if [ -f /usr/share/applications/qmmp.desktop ]; then
   ln -s /usr/share/applications/qmmp.desktop /usr/share/applications/qmmp-1.desktop;
@@ -184,24 +184,24 @@ chmod u+s /usr/bin/ping;
 #/usr/sbin/ufw enable;
 sed -i '/^ENABLED=/s/ENABLED=no/ENABLED=yes/' /etc/ufw/ufw.conf
 
-echo "latitude-7240" > /etc/hostname;
-echo "127.0.1.1   latitude-7240" >> /etc/hosts;
+echo "latitude-7420" > /etc/hostname;
+echo "127.0.1.1   latitude-7420" >> /etc/hosts;
 
 # Zmiany można umieścić również tutaj jeśli dotyczą one użytkowników lub ich
 # plików konfiguracyjnych
 
-cp -vv ~/latitude-7240/immudex-run-thunderbird /usr/local/bin/immudex-run-thunderbird;
+cp -vv ~/latitude-7420/immudex-run-thunderbird /usr/local/bin/immudex-run-thunderbird;
 chmod +x /usr/local/bin/*;
 
-#cp -vv ~/latitude-7240/displays.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml;
-#cp -vv ~/latitude-7240/pointers.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
+#cp -vv ~/latitude-7420/displays.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml;
+cp -vv ~/latitude-7420/pointers.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/pointers.xml
 mkdir /etc/skel/.config/xfce4/panel/launcher-16;
 mkdir /etc/skel/.config/xfce4/panel/launcher-17;
-cp -vv ~/latitude-7240/16967093831.desktop /etc/skel/.config/xfce4/panel/launcher-16/16967093831.desktop;
-cp -vv ~/latitude-7240/launcher-17/17399705731.desktop /etc/skel/.config/xfce4/panel/launcher-17/17399705731.desktop;
-cp -vv ~/latitude-7240/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml;
-cp -vv ~/latitude-7240/whiskermenu-1.rc /etc/skel/.config/xfce4/panel/whiskermenu-1.rc
-cp -vv ~/latitude-7240/bashrc /etc/skel/.bashrc;
+cp -vv ~/latitude-7420/16967093831.desktop /etc/skel/.config/xfce4/panel/launcher-16/16967093831.desktop;
+cp -vv ~/latitude-7420/launcher-17/17399705731.desktop /etc/skel/.config/xfce4/panel/launcher-17/17399705731.desktop;
+cp -vv ~/latitude-7420/xfce4-panel.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml;
+cp -vv ~/latitude-7420/whiskermenu-1.rc /etc/skel/.config/xfce4/panel/whiskermenu-1.rc
+cp -vv ~/latitude-7420/bashrc /etc/skel/.bashrc;
 
 echo -n "Username: ";
 read username;
@@ -221,24 +221,24 @@ usermod -L root;
 # Miejsce na twoje zmiany, przed poleceniem 'tidy'
 #bash ~/immudex/addons/nvidiaLatest;
 bash ~/immudex/addons/kvm;
-bash ~/latitude-7240/nextcloud;
+bash ~/latitude-7420/nextcloud;
 install_packages wireshark;
 bash ~/immudex/addons/chirp;
 bash ~/immudex/addons/iwlwifi;
 bash ~/immudex/addons/ncspot;
 bash ~/immudex/addons/lampstack;
 bash ~/immudex/addons/realtek;
-cp -vv ~/latitude-7240/morketsmerke.nmconnection /etc/NetworkManager/system-connections/morketsmerke.nmconnection
+cp -vv ~/latitude-7420/morketsmerke.nmconnection /etc/NetworkManager/system-connections/morketsmerke.nmconnection
 
 chmod 600 /etc/NetworkManager/system-connections/*;
 usermod -aG www-data xf0r3m
 chown -R www-data:www-data /var/www
 chmod -R 775 /var/www;
-cp -vv ~/latitude-7240/oh-my-posh-install.sh /tmp/oh-my-posh-install.sh;
+cp -vv ~/latitude-7420/oh-my-posh-install.sh /tmp/oh-my-posh-install.sh;
 bash /tmp/oh-my-posh-install.sh
 mv /root/.cache/oh-my-posh /usr/share;
 rm /tmp/oh-my-posh-install.sh;
-cp -vv ~/latitude-7240/immudex-nu.omp.json.nu-deploy /usr/share/oh-my-posh/immudex-nu.omp.json;
+cp -vv ~/latitude-7420/immudex-nu.omp.json.nu-deploy /usr/share/oh-my-posh/immudex-nu.omp.json;
 cd
 MLDepsUrl="https://gitweb.morketsmerke.org/?p=ML.git;a=blob_plain;f=dependecies.txt;hb=5e30c5b6d7f490bfdfffaa2cff615dc794534f8a";
 install_packages $(curl "$MLDepsUrl" 2> /dev/null | awk '{printf $1" "}')
@@ -253,7 +253,7 @@ sudo make install;
 cd ..
 
 
-wget ftp.morketsmerke.org/~xf0r3m/latitude-7240/rtl_sdr_driver
+wget ftp.morketsmerke.org/~xf0r3m/latitude-7420/rtl_sdr_driver
 bash rtl_sdr_driver;
 rm -rf ~/rtl-sdr-blog;
 usermod -aG plugdev xf0r3m
@@ -271,12 +271,12 @@ apt install -y ./teamviewer_amd64.deb
 kill $(pidof gpg-agent)
 
 install_packages kdeconnect kaccounts-providers;
-cp -vv ~/latitude-7240/ufw-setup.service /etc/systemd/system;
+cp -vv ~/latitude-7420/ufw-setup.service /etc/systemd/system;
 systemctl enable ufw-setup.service;
 
-cp -vv ~/latitude-7240/ufw-setup /usr/local/sbin/ufw-setup;
+cp -vv ~/latitude-7420/ufw-setup /usr/local/sbin/ufw-setup;
 chmod +x /usr/local/sbin/ufw-setup;
 
-rm -rf ~/latitude-7240
+rm -rf ~/latitude-7420
 
 tidy;

diff --git a/immudex-motd2 b/immudex-motd2
index e0f4c6439a73d08aeebf81b5a7500875f8f23f99..8a73671fd1ea6afdc2074c9019d654d592998d77 100755 (executable)
--- a/immudex-motd2
+++ b/immudex-motd2
@@ -5,7 +5,7 @@
 #ascii_colors;
 #echo -en "\e[1m"; echo "immudex" | /usr/bin/figlet | lolcat; echo -en "\e[0m";
 #echo "immudex" | /usr/bin/figlet | lolcat
-echo "X280" | /usr/bin/figlet -f /usr/share/figlet-fonts/3d.flf | lolcat
+echo "latitude-7420" | /usr/bin/figlet -f /usr/share/figlet-fonts/3d.flf | lolcat
 echo;
 echo "Today is: $(date)";
 echo;

diff --git a/morketsmerke.nmconnection b/morketsmerke.nmconnection
index f69c8c6317099996ca131111f676caf004082405..5d656deb93d134182cd354f55f03d1aea81dfb87 100755 (executable)
--- a/morketsmerke.nmconnection
+++ b/morketsmerke.nmconnection
@@ -7,13 +7,13 @@ permissions=user:xf0r3m:;
 timestamp=1740503929
 
 [vpn]
-ca=/ic0/vpn/cacert.pem
-cert=/ic0/vpn/X280_crt.pem
+ca=/ic0/vpn/latitude-7420_certs/cacert.pem
+cert=/ic0/vpn/latitude-7420_certs/latitude-7420_crt.pem
 cert-pass-flags=0
 comp-lzo=adaptive
 connection-type=tls
 dev=tun0
-key=/ic0/vpn/X280_key.pem
+key=/ic0/vpn/latitude-7420_certs/latitude-7420_key.pem
 port=17003
 remote=194.110.5.148
 service-type=org.freedesktop.NetworkManager.openvpn

diff --git a/pointers.xml b/pointers.xml
new file mode 100644 (file)
index 0000000..0df7e66
--- /dev/null
+++ b/pointers.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="pointers" version="1.0">
+  <property name="DELL0A3600_0488101A_Touchpad" type="empty">
+    <property name="Properties" type="empty">
+      <property name="libinput_Tapping_Enabled" type="int" value="1"/>
+    </property>
+  </property>
+</channel>

diff --git a/template.sh b/template.sh
index 6edf592d8a037dc7b251bc335c80d0806877ad03..5e2cb7d5e6afaeb1780272e02785a74554865650 100644 (file)
--- a/template.sh
+++ b/template.sh
@@ -69,7 +69,7 @@ function make_changelog_file() {
   echo "COMMIT=\"${COMMIT}\"" >> $FILE;
   echo "ADDONS=\"${ADDONS}\"" >> $FILE;
   echo "-== Diffrences in version file ==-" >> $FILE;
-  cp ${HOME}/immudex/versions/base.sh ${HOME}/X280/base.sh; 
-  (cd ${HOME}/X280 && git diff base.sh) >> $FILE;
+  cp ${HOME}/immudex/versions/base.sh ${HOME}/latitude-7420/base.sh; 
+  (cd ${HOME}/latitude-7420 && git diff base.sh) >> $FILE;
   return 0;
 }