From 9db4d8c02bab9abcd322822707e64514bdb95026 Mon Sep 17 00:00:00 2001 From: xf0r3m Date: Mon, 14 Aug 2023 08:47:33 +0200 Subject: [PATCH] =?utf8?q?Synchronizacja=20repozytori=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- addons/baytrail_sound | 53 +++++++ changelogs/1.0.6.txt | 2 +- changelogs/1.0.7.txt | 16 ++ changelogs/1.0.8.txt | 14 ++ files/107/gtk-main.css | 172 +++++++++++++++++++++ files/107/xfce4-keyboard-shortcuts.xml | 197 +++++++++++++++++++++++++ files/108/xfwm4.xml | 91 ++++++++++++ tools/108/idle-clic | 48 ++++++ tools/108/pl | 80 ++++++++++ versions/107.sh | 20 +++ versions/108.sh | 21 +++ 11 files changed, 713 insertions(+), 1 deletion(-) create mode 100644 addons/baytrail_sound create mode 100644 changelogs/1.0.7.txt create mode 100644 changelogs/1.0.8.txt create mode 100644 files/107/gtk-main.css create mode 100644 files/107/xfce4-keyboard-shortcuts.xml create mode 100644 files/108/xfwm4.xml create mode 100755 tools/108/idle-clic create mode 100755 tools/108/pl create mode 100644 versions/107.sh create mode 100644 versions/108.sh diff --git a/addons/baytrail_sound b/addons/baytrail_sound new file mode 100644 index 0000000..a86cd01 --- /dev/null +++ b/addons/baytrail_sound @@ -0,0 +1,53 @@ +#!/bin/bash + +if [ "$1" ]; then + case $1 in + "install") echo "Installation $(basename $0) addon..."; + if [ ! -d /usr/share/immudex_addons ]; then + mkdir /usr/share/immudex_addons; + fi + cat >> $(basename $0)_installer << EOF +if [ ! -d /boot ]; then + mkdir /boot; + apt purge linux-image* --purge -y; + apt install linux-image-amd64; +fi + +cp -vv /etc/apt/sources.list /etc/apt/sources.list.d/baytrail-sound.list; +sed -e 's/main/contrib non-free non-free-firmware/g' -i /etc/apt/sources.list.d/baytrail-sound.list; + +apt update; +apt install firmware-sof-signed firmware-intel-sound; + +rm /etc/apt/sources.list.d/baytrail-sound.list; +apt update; + +apt-get autoclean; +apt-get autoremove; +apt-get clean; +apt-get clean; +EOF + bash $(basename $0)_installer; + if [ $? -eq 0 ]; then + rm $(basename $0)_installer; + echo $(basename $0) | tee -a /usr/share/immudex_addons/installed_addons; + echo "Installation $(basename $0) addon...[ OK ]"; + fi;; + "remove") echo "Removing $(basename $0) addon..."; + cat >> $(basename $0)_uninstaller << EOF +apt remove -y firmware-sof-signed firmware-intel-sound; +apt-get autoclean; +apt-get autoremove -y; +apt-get clean; +EOF + bash $(basename $0)_uninstaller; + if [ $? -eq 0 ]; then + rm $(basename $0)_uninstaller; + sed -i "s/$(basename $0)//g" /usr/share/immudex_addons/installed_addons; + echo "Removing $(basename $0) addon...[ OK ]"; + fi;; + esac +else + echo "Internal error: action must be given."; + exit 1; +fi diff --git a/changelogs/1.0.6.txt b/changelogs/1.0.6.txt index ea74a46..4e88ab5 100644 --- a/changelogs/1.0.6.txt +++ b/changelogs/1.0.6.txt @@ -1,4 +1,4 @@ -immudex-testing 1.0.5 - tygodniowy build 30.07.2023 +immudex-testing 1.0.6 - tygodniowy build 30.07.2023 1. Aktualizacja pakietów. diff --git a/changelogs/1.0.7.txt b/changelogs/1.0.7.txt new file mode 100644 index 0000000..bc6614c --- /dev/null +++ b/changelogs/1.0.7.txt @@ -0,0 +1,16 @@ +immudex-testing 1.0.7 - tygodniowy build 06.08.2023 + + 1. Aktualizacja pakietów. + + 2. Usunięcie pakietu 'xpra'. + + 3. Zmiana domyślnego wyglądu apletu 'xfce4-notes-plugin' - przywrócono + domyślny wygląd dla immudex - BT #101. + + 4. Dodanie skrótów klawiszowych pozwalających wyrównać okno do wybranej + krawędzi ekranu (zgodnie z klawiszami kierunkowymi w 'Vim') oraz + przenieść okno na wybrany monitor + (Ctrl+Shift+! - lewy, Ctrl+Shift+@ - prawy) + + + diff --git a/changelogs/1.0.8.txt b/changelogs/1.0.8.txt new file mode 100644 index 0000000..37dc97e --- /dev/null +++ b/changelogs/1.0.8.txt @@ -0,0 +1,14 @@ +immudex-testing 1.0.8 - tygodniowy build 18.08.2023 + + 1. Aktualizacja pakietów. + + 2. Dodanie klienta projektu IDLE. + + 3. Aktualizacja narzędzia 'pl'. Dodanie możliwości podania odnośnika URL + (HTTP/HTTPS) do listy z linkami. + + 4. Wyłącznie przesuwania okna poprzez kliknięcie na nie z przytrzymanym + lewym klawiszem 'Alt'. + + + diff --git a/files/107/gtk-main.css b/files/107/gtk-main.css new file mode 100644 index 0000000..cf86688 --- /dev/null +++ b/files/107/gtk-main.css @@ -0,0 +1,172 @@ +@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-image: url("/usr/share/images/desktop-base/notes-background.jpg"); + background-position: center; + background-repeat: no-repeat; + 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/107/xfce4-keyboard-shortcuts.xml b/files/107/xfce4-keyboard-shortcuts.xml new file mode 100644 index 0000000..594a4e5 --- /dev/null +++ b/files/107/xfce4-keyboard-shortcuts.xml @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/108/xfwm4.xml b/files/108/xfwm4.xml new file mode 100644 index 0000000..995c991 --- /dev/null +++ b/files/108/xfwm4.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/108/idle-clic b/tools/108/idle-clic new file mode 100755 index 0000000..706b14a --- /dev/null +++ b/tools/108/idle-clic @@ -0,0 +1,48 @@ +#!/bin/bash + +function help() { + echo 'idle-cli - Inter-Distribution Linux Environment CLI'; + echo '@ 2023 morketsmerke.org'; + echo; + echo "Options:"; + echo " list-distros - listing available containers with Linux distros on this server"; + echo " shell - bring up the shell of given distro"; + echo " check-commmand - verify is given command exists in given distro"; + echo " apropos - finds commmands match to given keywords"; + echo " pkgsearch - check is given package is ready to install in given distro"; + echo; + echo " - pointing only one distro, but you can use also:" + echo " :"; + echo " --deb - .deb packages using distros (debian,kali,ubuntu)"; + echo " --rpm - .rpm packages using distros (fedora,rocky,opensuse)"; + echo " --other - other distros don't match to above (alpine,archlinux,gentoo,void)"; + echo " or <--all> - all 10 available distros (warning, output could be large, use some of pager)"; + echo; + echo 'Usage:'; + echo ' $ idle-clic list-distros'; + echo ' $ idle-clic shell rocky'; + echo ' $ idle-clic check-command netstat'; + echo ' $ idle-clic apropos zip'; + echo ' $ idle-clic pkgsearch "intel sound"'; + echo; + echo 'IDLE Configuration:'; + echo 'In ~/.idle/.idle.conf file (example of this file: /usr/share/idle/idle.conf)'; + echo ' RUSER="user";'; + echo ' IDLESERVER="idle.example.org";'; + echo ' SSH_OPTS="-p 10022 -i ~/id_rsa"; #OPTIONAL'; +} + +if [ -f ~/.idle/idle.conf ]; then + source ~/.idle/idle.conf; + echo "IDLE Server response:"; + if echo $@ | grep -q 'shell'; then + ssh -t ${SSH_OPTS} ${RUSER}@${IDLESERVER} "idle-clis $@"; + else + ssh ${SSH_OPTS} ${RUSER}@${IDLESERVER} "idle-clis $@"; + fi + if [ $? -eq 1 ]; then help; exit 1; fi +else + echo "There is no IDLE config file. Exiting..."; + help; + exit 1; +fi diff --git a/tools/108/pl b/tools/108/pl new file mode 100755 index 0000000..7f08f4f --- /dev/null +++ b/tools/108/pl @@ -0,0 +1,80 @@ +#!/bin/bash + +GREEN="\e[32m"; +RED="\e[31m"; +ENDCOLOR="\e[0m"; + +if [ "$1" ] && [ $1 = "--video" ]; then + video=1; + shift; + if [ $# -gt 1 ]; then format="--ytdl-format=$1"; shift; file=$1; + else format="--ytdl-forma=best"; file=$1; fi +else + file=$1; +fi + +function help() { + echo "pl - Play Links. Skrypt to odtwarzania multimediów z listy linków"; + echo "morketsmerke.org; COPYLEFT; 2023"; + echo; + echo "Opcje:"; + echo; + echo -e "\t--video [format] - możliwość odtwarzania linków jako filmów. Format"; + echo -e "\tjest opcjonalny, w przypadku jego braku, domyślnym formatem jest"; + echo -e "\t'best'."; + echo; + echo "Użycie:"; + echo -e "\t$ pl sciezka/do/listy/linkow"; + echo; + echo "Format listy:"; + echo -e "\tnazwa linku: https://youtube.com/..."; +} + +if echo $file | grep -q 'http'; then + echo -n "Getting link list..."; + wget -q $file -O /tmp/playlist.txt; + if [ $? -eq 0 ]; then + echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; + file="/tmp/playlist.txt"; + else + echo -e "[ ${RED}FAIL${ENDCOLOR} ]"; + help; + exit 1; + fi +fi + +if [ "$file" ]; then + PS3="Link: "; + linkNames=$(cut -d ":" -f 1 $file | sed 's/\ /_/g' | awk '{printf $1" "}') + select name in $linkNames; do + if [ "$MPVPID" ]; then kill $MPVPID; fi + if [ ! "$name" ]; then break; fi + link=$(grep "$name" $file | cut -d ":" -f 2-); + if [ ! "$link" ]; then + linkName=$(echo $name | sed 's/_/\ /g'); + link=$(grep "$linkName" $file | cut -d ":" -f 2-); + fi + if echo $link | grep -q "youtube"; then + link=$(echo $link | sed 's/\ //g'); + if [ "$video" ]; then + #ytplay -v $link -f $format + mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$! + else + #ytplay -a $link -f best[height=360] + format="--no-video --ytdl-format=best[height=360]"; + mpv $format ytdl://$link > /dev/null 2>&1 & MPVPID=$! + fi + else + mpv --no-video $link > /tmp/pl.log 2>&1 & MPVPID=$!; + tail -f /tmp/pl.log | grep "icy-title" & + fi + #echo "MPV: $MPVPID"; + done +else + help; + exit 1; +fi + +if [ -f /tmp/playlist.txt ]; then + rm /tmp/playlist.txt; +fi diff --git a/versions/107.sh b/versions/107.sh new file mode 100644 index 0000000..e68daaa --- /dev/null +++ b/versions/107.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +dhclient; +cd +if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex-testing.git; +else apt install git && git clone https://github.com/xf0r3m/immudex-testing.git; +fi +source ~/immudex-testing/versions/template.sh; + +update_packages; +apt purge -y xpra; + +cp -vv ~/immudex-testing/files/${VERSION}/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0; +cp -vv ~/immudex-testing/files/${VERSION}/xfce4-keyboard-shortcuts.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml; + +recreate_users; + +set_mime; + +tidy; diff --git a/versions/108.sh b/versions/108.sh new file mode 100644 index 0000000..f7c7354 --- /dev/null +++ b/versions/108.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +dhclient; +cd +if [ -x /usr/bin/git ]; then git clone https://github.com/xf0r3m/immudex-testing.git; +else apt install git && git clone https://github.com/xf0r3m/immudex-testing.git; +fi +source ~/immudex-testing/versions/template.sh; + +update_packages; + +cp -vv ~/immudex-testing/tools/${VERSION}/idle-clic /usr/local/bin; +cp -vv ~/immudex-testing/tools/${VERSION}/pl /usr/local/bin; + +cp -vv ~/immudex-testing/files/${VERSION}/xfwm4.xml /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml; + +recreate_users; + +set_mime; + +tidy; -- 2.39.5