Przygotowanie do wydania immudex w wersji 1.0.4 - część 2

diff --git a/files/104/gtk-main.css b/files/104/gtk-main.css
new file mode 100644 (file)
index 0000000..6d9d648
--- /dev/null
+++ b/files/104/gtk-main.css
@@ -0,0 +1,168 @@
+@define-color notes_bg_color #343434;
+@define-color theme_base_color #343434;
+@define-color theme_text_color #eeeeec;
+@define-color theme_bg_color @theme_base_color;
+@define-color theme_fg_color shade (@theme_base_color, 0.3);
+@define-color theme_selected_bg_color shade (@theme_base_color, 0.8);
+@define-color theme_selected_fg_color shade (@theme_base_color, 1.4);
+@define-color insensitive_bg_color shade (@theme_bg_color, 1.1);
+@define-color insensitive_fg_color shade (@theme_fg_color, 1.8);
+
+@define-color borders shade (@theme_base_color, 0.8);
+@define-color frame_color shade (@theme_base_color, 0.7);
+@define-color notebook_active_tab_border shade (@theme_base_color, 1.1);
+@define-color notebook_selected_tab_color shade (@theme_base_color, 0.9);
+
+* {
+       border-width: 0px;
+}
+
+/* window and frame */
+window {
+       /*
+       background-image: linear-gradient(to bottom,
+                                         shade (@theme_base_color, 0.8),
+                                         shade (@theme_base_color, 0.95) 87px);
+                                         */
+}
+
+window frame {
+       padding: 1px 2px 4px 2px;
+       border: 1px solid shade (@theme_base_color, 0.7);
+}
+
+/* icon buttons in window title bar */
+window widget#notes-icon-button {
+       color: #eeeeec;
+       background-color: transparent;
+}
+/*
+window widget#notes-icon-button:active {
+       color: lighter (@theme_fg_color);
+       text-shadow: 1px 1px darker (@theme_bg_color);
+}
+*/
+window widget#notes-icon-button:disabled {
+       color: shade (#343434, 1.2);
+}
+window widget#notes-icon-button:hover {
+       color: shade (#eeeeec, 1.4);
+}
+
+/* notebook */
+notebook > header {
+       background: transparent;
+}
+notebook > header.top {
+       border-bottom: 2px solid @theme_selected_bg_color;
+}
+notebook > header.bottom {
+       border-top: 2px solid @theme_selected_bg_color;
+}
+notebook > header.left {
+       border-right: 2px solid @theme_selected_bg_color;
+}
+notebook > header.right {
+       border-left: 2px solid @theme_selected_bg_color;
+}
+
+/* notebook tab style */
+notebook > header.top tab, notebook > header.bottom tab {
+       padding: 0px 4px;
+}
+notebook > header.right tab, notebook > header.left tab {
+       padding: 4px 0px;
+}
+
+notebook > header tab {
+       box-shadow: none;
+       color: @insensitive_fg_color;
+       background: transparent;
+}
+notebook > header tab:checked {
+       color: shade (@theme_text_color, 0.8);
+}
+notebook > header tab.dnd {
+       background: @theme_selected_bg_color;
+}
+
+notebook > header.top > tabs > tab:checked {
+       box-shadow: inset 0px -3px shade (@theme_selected_bg_color, 1.3), 0px 2px 3px @theme_selected_bg_color;
+}
+notebook > header.top > tabs > tab:checked:hover {
+       box-shadow: inset 0px -2px shade (@theme_selected_bg_color, 1.3), 0px 2px 3px @theme_selected_bg_color;
+       background: @theme_selected_bg_color; /* NOTE: must be set before .dnd */
+}
+notebook > header.top > tabs > tab:hover {
+       box-shadow: inset 0px -2px shade (@theme_selected_bg_color, 1.3);
+}
+
+notebook > header.bottom > tabs > tab:checked {
+       box-shadow: inset 0px 3px shade (@theme_selected_bg_color, 1.3), 0px -2px 3px @theme_selected_bg_color;
+}
+notebook > header.bottom > tabs > tab:checked:hover {
+       box-shadow: inset 0px 2px shade (@theme_selected_bg_color, 1.3), 0px -2px 3px @theme_selected_bg_color;
+       background: @theme_selected_bg_color;
+}
+notebook > header.bottom > tabs > tab:hover {
+       box-shadow: inset 0px 2px shade (@theme_selected_bg_color, 1.3);
+}
+
+notebook > header.left > tabs > tab:checked {
+       box-shadow: inset -3px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
+}
+notebook > header.left > tabs > tab:checked:hover {
+       box-shadow: inset -2px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
+       background: @theme_selected_bg_color;
+}
+notebook > header.left > tabs > tab:hover {
+       box-shadow: inset -2px 0px shade (@theme_selected_bg_color, 1.3);
+}
+
+notebook > header.right > tabs > tab:checked {
+       box-shadow: inset 3px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
+}
+notebook > header.right > tabs > tab:checked:hover {
+       box-shadow: inset 2px 0px shade (@theme_selected_bg_color, 1.3), 0px 0px 3px @theme_selected_bg_color;
+       background: @theme_selected_bg_color;
+}
+notebook > header.right > tabs > tab:hover {
+       box-shadow: inset 2px 0px shade (@theme_selected_bg_color, 1.3);
+}
+
+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-size: cover;
+       font-weight: bold;
+}
+
+textview > text > selection {
+       color: #343434;
+       background-color: #eeeeec;
+}
+
+scrollbar {
+       background-color: transparent;
+}
+scrollbar slider {
+       background-color: shade (@theme_bg_color, 0.55);
+       min-width: 8px;
+}
+scrollbar slider:hover {
+       background-color: shade (@theme_bg_color, 0.7);
+       transition: 400ms;
+}
+scrollbar slider:hover:active {
+       background-color: shade (@theme_bg_color, 0.55);
+       transition: 200ms;
+}
+
+tooltip, tooltip * {
+       margin: 0px;
+       padding: 0px;
+}
+

diff --git a/files/104/librewolf.desktop b/files/104/librewolf.desktop
new file mode 100644 (file)
index 0000000..c21688c
--- /dev/null
+++ b/files/104/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/104/librewolf.tgz b/files/104/librewolf.tgz
new file mode 100644 (file)
index 0000000..bdeca33
Binary files /dev/null and b/files/104/librewolf.tgz differ

diff --git a/files/104/terminalrc b/files/104/terminalrc
new file mode 100644 (file)
index 0000000..3388dd1
--- /dev/null
+++ b/files/104/terminalrc
@@ -0,0 +1,35 @@
+[Configuration]
+MiscAlwaysShowTabs=FALSE
+MiscBell=FALSE
+MiscBellUrgent=FALSE
+MiscBordersDefault=TRUE
+MiscCursorBlinks=FALSE
+MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
+MiscDefaultGeometry=100x30
+MiscInheritGeometry=FALSE
+MiscMenubarDefault=TRUE
+MiscMouseAutohide=FALSE
+MiscMouseWheelZoom=TRUE
+MiscToolbarDefault=FALSE
+MiscConfirmClose=TRUE
+MiscCycleTabs=TRUE
+MiscTabCloseButtons=TRUE
+MiscTabCloseMiddleClick=TRUE
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE
+MiscMiddleClickOpensUri=FALSE
+MiscCopyOnSelect=FALSE
+MiscShowRelaunchDialog=TRUE
+MiscRewrapOnResize=TRUE
+MiscUseShiftArrowsToScroll=FALSE
+MiscSlimTabs=FALSE
+MiscNewTabAdjacent=FALSE
+MiscSearchDialogOpacity=100
+MiscShowUnsafePasteDialog=TRUE
+MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU
+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/104/lightdm_wallpaper.jpg b/images/104/lightdm_wallpaper.jpg
new file mode 100755 (executable)
index 0000000..6f7c3fe
Binary files /dev/null and b/images/104/lightdm_wallpaper.jpg differ

diff --git a/tools/104/secured-firefox b/tools/104/secured-firefox
new file mode 100755 (executable)
index 0000000..cfc6676
--- /dev/null
+++ b/tools/104/secured-firefox
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! -d /tmp/${USER} ]; then
+  mkdir /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/librewolf

diff --git a/versions/104.sh b/versions/104.sh
index 98f1da9d26afa3492cb31d4ecd2b427538972988..4a15d7509a85e7a37fb1d9566fa311f350173a37 100644 (file)
--- a/versions/104.sh
+++ b/versions/104.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 ARCH=$(dpkg --print-architecture);
-dhclient;
 cd
-if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex.git;
-else apt install git && git clone https://github.com/xf0r3m/immudex.git;
+if [ -x /usr/bin/git ]; then git clone https://git.morketsmerke.org/git/immudex;
+else apt install git && git clone https://git.morketsmerke.org/git/immudex
 fi
 source ~/immudex/versions/template.sh;
 
@@ -22,8 +21,16 @@ fi
 ln -s /usr/lib/librewolf/librewolf /usr/bin/librewolf;
 
 cp -vv ~/immudex/files/${VERSION}/LibreWolf\ \(Firejailed\).desktop /etc/skel/Pulpit;
-rm -v /etc/skel/Pulpit/Frefox.desktop;
+rm -v /etc/skel/Pulpit/Firefox.desktop;
 
+cp -vv ~/immudex/files/${VERSION}/terminalrc /etc/skel/.config/xfce4/terminal;
+cp -vv ~/immudex/files/${VERSION}/librewolf.desktop /usr/share/applications;
+cp -vv ~/immudex/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0;
+tar -xf ~/immudex/files/${VERSION}/librewolf.tgz -C /etc/skel;
+
+cp -vv ~/immudex/tools/${VERSION}/secured-firefox /usr/local/bin;
+
+cp -vv ~/immudex/images/${VERSION}/lightdm_wallpaper.jpg /usr/share/images/desktop-base;
 recreate_users;
 
 set_mime;