From: Ian Kelling Date: Wed, 17 Jul 2019 01:17:34 +0000 (-0400) Subject: various fixes X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;ds=inline;h=092eddeca14a9e0694ce9550abdb663b9e900489;hp=5f97e1c4a592a6384a7a3d86f8ed337beb7e108f;p=distro-setup various fixes --- diff --git a/brc b/brc index 1c1f0f8..5f12a07 100644 --- a/brc +++ b/brc @@ -1276,6 +1276,20 @@ net-dev-info() { } +nk() { + ser stop NetworkManager + ser stop dnsmasq + s resolvconf -d NetworkManager + ser start dnsmasq + s ifup br0 +} +ngo() { + s ifdown br0 + ser start NetworkManager + sleep 4 + s nmtui-connect +} + nopanic() { sudo tee -a /var/log/exim4/paniclog-archive /dev/null; then + cd $(mktemp -d) + wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh + # added some stuff to envonment.sh for profile based on + # manual instructions + # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import - + # echo is to get past prompt + echo | sudo -E HOME=/home/iank bash guix-install.sh + guix install glibc-utf8-locales + guix package --install guile +fi + #### tor case $distro in # based on diff --git a/dynamic-ip-update b/dynamic-ip-update index 185eef2..3ece5b3 100755 --- a/dynamic-ip-update +++ b/dynamic-ip-update @@ -54,6 +54,7 @@ EOF if $up4; then cat >>$f </dev/null; then - temp="$(mktemp)" - eval "$($GPGAGENT --homedir /p/do-not-delete --daemon --sh --write-env-file=$PID_FILE 2>$temp)" - temperr="$(<"$temp")" - [ -n "$temperr" ] && xmessage "gpg-agent stderr: $temperr" - elif [ -r "$PID_FILE" ]; then - . "$PID_FILE" - export GPG_AGENT_INFO - fi + if ! $GPGAGENT 2>/dev/null; then + temp="$(mktemp)" + eval "$($GPGAGENT --homedir /p/do-not-delete --daemon --sh --write-env-file=$PID_FILE 2>$temp)" + temperr="$(<"$temp")" + [ -n "$temperr" ] && xmessage "gpg-agent stderr: $temperr" + elif [ -r "$PID_FILE" ]; then + . "$PID_FILE" + export GPG_AGENT_INFO + fi fi # background: