From afa36e6158d9386e3230926881505ce4ed7a6fed Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Tue, 19 Dec 2023 02:32:26 +0500 Subject: [PATCH] Update --- .../copy-calamares-to-desktop.sh.desktop | 7 +++++++ root/.gnupg/gpg.conf | 7 +++++++ root/.local/bin/copy-calamares-to-desktop.sh | 17 +++++++++++++++++ root/.local/bin/key-sign.sh | 19 ++++++++++++++----- 4 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 root/.config/autostart/copy-calamares-to-desktop.sh.desktop create mode 100644 root/.gnupg/gpg.conf create mode 100755 root/.local/bin/copy-calamares-to-desktop.sh diff --git a/root/.config/autostart/copy-calamares-to-desktop.sh.desktop b/root/.config/autostart/copy-calamares-to-desktop.sh.desktop new file mode 100644 index 0000000..9ddc467 --- /dev/null +++ b/root/.config/autostart/copy-calamares-to-desktop.sh.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Exec=/usr/bin/bash ~/.local/bin/copy-calamares-to-desktop.sh +Icon= +Name=copy-calamares-to-desktop.sh +Path= +Terminal=False +Type=Application diff --git a/root/.gnupg/gpg.conf b/root/.gnupg/gpg.conf new file mode 100644 index 0000000..c9893f8 --- /dev/null +++ b/root/.gnupg/gpg.conf @@ -0,0 +1,7 @@ +personal-digest-preferences SHA512 +cert-digest-algo SHA512 + +# keyserver hkps://keys.openpgp.org +keyserver hkp://keyserver.ubuntu.com:80 + +auto-key-retrieve diff --git a/root/.local/bin/copy-calamares-to-desktop.sh b/root/.local/bin/copy-calamares-to-desktop.sh new file mode 100755 index 0000000..2e8fe5c --- /dev/null +++ b/root/.local/bin/copy-calamares-to-desktop.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +sleep 5 + +if [ -f "/etc/xdg/autostart/calamares.desktop" ]; then + if [ -d "$HOME/Рабочий стол" ]; then + cp "/etc/xdg/autostart/calamares.desktop" "$HOME/Рабочий стол/" + cp "$HOME/.config/autostart/key-sign.sh.desktop" "$HOME/Рабочий стол/" + sudo chown -R 1000:1000 "$HOME" + fi + + if [ -d "$HOME/Desktop/" ]; then + cp "/etc/xdg/autostart/calamares.desktop" "$HOME/Desktop/" + cp "$HOME/.config/autostart/key-sign.sh.desktop" "$HOME/Desktop/" + sudo chown -R 1000:1000 "$HOME" + fi +fi diff --git a/root/.local/bin/key-sign.sh b/root/.local/bin/key-sign.sh index 32bf2b7..0459621 100755 --- a/root/.local/bin/key-sign.sh +++ b/root/.local/bin/key-sign.sh @@ -22,7 +22,19 @@ haveged -w 1024 pacman-key --init pkill haveged -pacman-key --populate archlinux melawy-linux endeavouros arcolinux chaotic cachyos +pacman-key --add /usr/share/pacman/keyrings/melawy-linux.gpg +pacman-key --lsign-key BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 +pacman-key --lsign-key B175815513971572FE7B1557CEC07AC8FF64DA4B + +if [ "$have_internet" -eq 0 ]; then + pacman-key --keyserver hkps://keys.openpgp.org --recv-keys BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 + pacman-key --keyserver hkps://keyserver.ubuntu.com --recv-keys BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 + pacman-key --lsign-key BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 + + pacman-key --keyserver hkps://keys.openpgp.org --recv-keys B175815513971572FE7B1557CEC07AC8FF64DA4B + pacman-key --keyserver hkps://keyserver.ubuntu.com --recv-keys B175815513971572FE7B1557CEC07AC8FF64DA4B + pacman-key --lsign-key B175815513971572FE7B1557CEC07AC8FF64DA4B +fi pacman-key --lsign-key melawy-linux pacman-key --lsign-key cachyos @@ -30,10 +42,7 @@ pacman-key --lsign-key arcolinux pacman-key --lsign-key chaotic pacman-key --lsign-key endeavouros -if [ "$have_internet" -eq 0 ]; then - pacman-key --recv-keys valeria@fadeeva.me --keyserver hkps://keys.openpgp.org - pacman-key --lsign-key valeria@fadeeva.me -fi +pacman-key --populate pacman-key --updatedb