diff --git a/liveuser/.local/bin/key-sign.sh b/liveuser/.local/bin/key-sign.sh index 7067f0d9..812d8c13 100755 --- a/liveuser/.local/bin/key-sign.sh +++ b/liveuser/.local/bin/key-sign.sh @@ -1,17 +1,36 @@ #!/bin/bash -for group in $(groups) -do - if [ "${group}" == "wheel" ] || [ "${group}" == "root" ]; then - echo "The user ${USER} is a member of the group ${group}" - break - else +key_status1=$(env LANG=C pacman-key -f valeria@fadeeva.me 2>&1 | grep "unknown") + +key_status2=$(env LANG=C pacman-key -f erik.dubois@gmail.com 2>&1 | grep "unknown") + +if [[ -z $key_status1 ]] && [[ -z $key_status2 ]]; then + exit +fi + +if [[ "$UID" != 0 ]]; then + counter=0 + + for group in $(groups) + do + if [ "${group}" == "wheel" ] || [ "${group}" == "root" ]; then + counter=$(( counter + 1 )) + echo "The user '${USER}' is a member of the group ${group}" + if [ ! -x "$0" ]; + chmod +x "$0" + fi + sudo /bin/sh -c "$0" + exit + fi + done + + if [[ $counter -eq 0 ]]; then echo "The user '${USER}' does not have permission to run this program." echo "The user '${USER}' is not a member of the wheel or root group." echo "" echo -e "Add the user '${USER}' to the wheel group - COPY AND PASTE in new konsole:\n - su -c \"usermod -a -G wheel ${USER}\"; qdbus org.kde.LogoutPrompt /LogoutPrompt promptLogout; exit" + su -c \"usermod -a -G wheel ${USER}\"; qdbus org.kde.LogoutPrompt /LogoutPrompt promptLogout; exit" echo "" echo "Or otherwise escalate privileges and run the program \"${HOME}/.config/autostart/$(basename ${0}).desktop\" again." echo "" @@ -27,15 +46,21 @@ do /usr/bin/konsole exit fi -done +fi +# if [[ "$UID" != 0 ]]; then +# echo "USER NOT ROOT" +# sudo "$0" +# exit +# else +# echo "USER IS ROOT" +# fi -if [[ "$UID" != 0 ]]; then - echo "USER NOT ROOT" - sudo "$0" - exit -else - echo "USER IS ROOT" +grep_text=$(ss -nlp | grep 9050) +if [[ "$?" == 0 ]]; then + export http_proxy="socks5://127.0.0.1:9050" + export https_proxy="socks5://127.0.0.1:9050" + export ftp_proxy="socks5://127.0.0.1:9050" fi ping -c 1 1.1.1.1 > /dev/null @@ -59,15 +84,15 @@ 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 +# 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 @@ -89,9 +114,9 @@ keyserver hkp://keyserver.ubuntu.com:80" | sudo tee --append /etc/pacman.d/gnupg pacman-key --updatedb -if [ "$have_internet" -eq 0 ]; then - pacman -Sy -fi +# if [ "$have_internet" -eq 0 ]; then +# pacman -Sy +# fi title="Successed!" msg="$(date '+%Y.%m.%d %H:%M:%S')" @@ -101,26 +126,29 @@ for user in $users do userid=$(/usr/bin/id -u "$user") - cmd=( - DISPLAY=:0 - DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/"$userid"/bus - /usr/bin/notify-send - --icon=info - --urgency=low - -t 5000 - -a "'Keys sign'" - "'$title'" - "'$msg'" - ) + if [ -S "/run/user/$userid/bus" ]; then + cmd=( + DISPLAY=:0 + DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/"$userid"/bus + /usr/bin/notify-send + --icon=info + --urgency=low + -t 5000 + -a "'Keys sign'" + "'$title'" + "'$msg'" + ) - /usr/bin/su "$user" -c "${cmd[*]}" + /usr/bin/su "$user" -c "${cmd[*]}" - if [ "$user" != "liveuser" ]; then - rm /home/"$user"/.config/autostart/key-sign.sh.desktop -# rm /home/"$user"/.local/bin/key-sign.sh - fi + if [ "$user" != "root" ] && [ "$user" != "liveuser" ]; then + if [ -f "/home/$user/.config/autostart/key-sign.sh.desktop" ]; then + rm /home/"$user"/.config/autostart/key-sign.sh.desktop + # rm /home/"$user"/.local/bin/key-sign.sh + fi + fi + fi done -echo "This window will close in 5 seconds" +echo "Finish!!!" sleep 5 -