Dostosowanie immudex-testing mdrr do finalnego obrazu płyty

diff --git a/files/gtk-main.css b/files/gtk-main.css
index cf86688a63ae12897502c97afb7d949e7c44652e..6d9d648a3cca1447bff768de8e2b51d00e62d514 100644 (file)
--- a/files/gtk-main.css
+++ b/files/gtk-main.css
@@ -132,14 +132,10 @@ notebook > header.right > tabs > tab:hover {
 
 textview > text {
        color: @theme_text_color;
-       /*
+       
        background-image: linear-gradient(to bottom,
                                          shade (@theme_bg_color, 1.2),
                                          shade (@theme_bg_color, 1.3) 20em);
-                                        */
-       background-image: url("/usr/share/images/desktop-base/notes-background.jpg");
-       background-position: center;
-       background-repeat: no-repeat;
        background-size: cover;
        font-weight: bold;
 }

diff --git a/files/librewolf.desktop b/files/librewolf.desktop
new file mode 100644 (file)
index 0000000..c21688c
--- /dev/null
+++ b/files/librewolf.desktop
@@ -0,0 +1,17 @@
+[Desktop Entry]
+Name=LibreWolf
+Name[pl]=LibreWolf
+Comment=Secure the World Wide Web Browsing
+Comment[pl]=Bezpieczene przeglądanie stron WWW
+GenericName=Secure Web Browser
+X-GNOME-FullName=LibreWolf Web Browser
+X-GNOME-FullName[pl]=Przeglądarka WWW LibreWolf
+Exec=/usr/lib/librewolf/librewolf %u
+Terminal=false
+X-MultipleArgs=false
+Type=Application
+Icon=/usr/lib/librewolf/browser/chrome/icons/default/default128.png
+Categories=Network;WebBrowser;
+MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;x-scheme-handler/http;x-scheme-handler/https;
+StartupWMClass=Firefox-esr
+StartupNotify=true

diff --git a/files/librewolf.tgz b/files/librewolf.tgz
new file mode 100644 (file)
index 0000000..bdeca33
Binary files /dev/null and b/files/librewolf.tgz differ

diff --git a/files/terminalrc b/files/terminalrc
index d692fa9b2d912ae03eb8abcfa30cb7ab339c0062..3388dd12df54aa218db900ec4f9ee7f26af8e432 100644 (file)
--- a/files/terminalrc
+++ b/files/terminalrc
@@ -1,5 +1,4 @@
 [Configuration]
-BackgroundMode=TERMINAL_BACKGROUND_IMAGE
 MiscAlwaysShowTabs=FALSE
 MiscBell=FALSE
 MiscBellUrgent=FALSE
@@ -32,4 +31,5 @@ BackgroundImageFile=/usr/share/images/desktop-base/lofi_girl.jpg
 BackgroundImageStyle=TERMINAL_BACKGROUND_STYLE_FILLED
 BackgroundImageShading=0,750000
 FontName=Source Code Pro Medium 12
+FontUseSystem=TRUE
 

diff --git a/images/notes-background.jpg b/images/notes-background.jpg
deleted file mode 100644 (file)
index 79239b5..0000000
Binary files a/images/notes-background.jpg and /dev/null differ

diff --git a/launchers/16844254192.desktop b/launchers/16844254192.desktop
index 7d2d601588a867ef78a49c9f12b69520e7876456..7ef05a7087b6ba43f19750b1a7122a5423964daa 100644 (file)
--- a/launchers/16844254192.desktop
+++ b/launchers/16844254192.desktop
@@ -1,19 +1,20 @@
 [Desktop Entry]
-Name=Firefox ESR (Firejailed)
-Name[pl]=Firefox ESR (Firejailed)
-Comment=Browse the World Wide Web
-Comment[pl]=Bezpieczne przeglądanie stron WWW 
+Name=LibreWolf (Firejailed)
+Name[pl]=LibreWolf (Firejailed)
+Comment=Secure the World Wide Web browsing
+Comment[pl]=Bezpieczne przeglądanie stron WWW
 GenericName=Web Browser
 GenericName[pl]=Przeglądarka WWW
-X-GNOME-FullName=Firefox ESR Web Browser
-X-GNOME-FullName[pl]=Przeglądarka WWW Firefox ESR
+X-GNOME-FullName=LibreWolf Web Browser
+X-GNOME-FullName[pl]=Przeglądarka WWW LibreWolf
 Exec=/usr/local/bin/immudex-secured-firefox
 Terminal=false
 X-MultipleArgs=false
 Type=Application
-Icon=firefox-esr
+Icon=/usr/lib/librewolf/browser/chrome/icons/default/default128.png
 Categories=Network;WebBrowser;
 MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;x-scheme-handler/http;x-scheme-handler/https;
 StartupWMClass=Firefox-esr
 StartupNotify=true
-X-XFCE-Source=file:///usr/share/applications/firefox-esr.desktop
+X-XFCE-Source=file:///usr/share/applications/librewolf.desktop
+Path=

diff --git a/tools/immudex-secured-firefox b/tools/immudex-secured-firefox
index 4041e896bc961b9dc74a83ed8e8b0b1bfcaef180..cfc6676d7fbb7fa6e0dc57b99a6b153a12e68152 100755 (executable)
--- a/tools/immudex-secured-firefox
+++ b/tools/immudex-secured-firefox
@@ -2,8 +2,8 @@
 
 if [ ! -d /tmp/${USER} ]; then
   mkdir /tmp/${USER}
-  cp -prvv /home/${USER}/.mozilla /tmp/${USER}
+  cp -prvv /home/${USER}/.librewolf /tmp/${USER}
 fi
 
 eth0=$(ip route show | grep 'default' | awk '{printf $5}');
-firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/firefox
+firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/librewolf

diff --git a/tools/immudex-secured-firefox_ b/tools/immudex-secured-firefox_
new file mode 100755 (executable)
index 0000000..4041e89
--- /dev/null
+++ b/tools/immudex-secured-firefox_
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! -d /tmp/${USER} ]; then
+  mkdir /tmp/${USER}
+  cp -prvv /home/${USER}/.mozilla /tmp/${USER}
+fi
+
+eth0=$(ip route show | grep 'default' | awk '{printf $5}');
+firejail --private=/tmp/${USER} --net=$eth0 /usr/bin/firefox

diff --git a/versions/base.sh b/versions/base.sh
index b7fdd6c9038c6f22732ecf348d531b6a5361b6c3..d637417ef4876685791948f69728782914bb55b5 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -33,6 +33,17 @@ 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 yt-dlp 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 mutt gimp openvpn netselect-apt gvfs-backends dnsutils xfce4-notes-plugin;
 
+if [ $(dpkg --print-architecture) = "amd64" ]; then
+  wget https://ftp.morketsmerke.org/immudex/testing/software/librewolf/librewolf-116.0.3-1.en-US.linux-x86_64.tar.bz2;
+  tar -xf librewolf-116.0.3-1.en-US.linux-x86_64.tar.bz2 -C /usr/lib;
+  rm librewolf-116.0.3-1.en-US.linux-x86_64.tar.bz2;
+else
+  wget https://ftp.morketsmerke.org/immudex/testing/software/librewolf/librewolf-116.0.3-1.en-US.linux-i686.tar.bz2;
+  tar -xf librewolf-116.0.3-1.en-US.linux-i686.tar.bz2 -C /usr/lib;
+  rm librewolf-116.0.3-1.en-US.linux-i686.tar.bz2;
+fi
+ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
+
 #head -1 /etc/apt/sources.list | tee /etc/apt/sources.list.d/xfce4-notes-plugin.list;
 #sed -i 's/testing/experimental/' /etc/apt/sources.list.d/xfce4-notes-plugin.list;
 #apt update;
@@ -99,9 +110,9 @@ cp -vv ~/immudex-testing/files/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.
 cp -vv ~/immudex-testing/files/immudex_hostname.service /etc/systemd/system;
 
 tar -xzvf ~/immudex-testing/files/mozilla.tgz -C /etc/skel;
+tar -xf ~/immudex-testing/files/librewolf.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/16844254192.desktop /etc/skel/.config/xfce4/panel/launcher-5;