minor improvements

diff --git a/brc b/brc
index 5ecfd817aa6d0a8072562a5e4b31f191d26a8e57..f0ae687d29cd6173c4735e937d1b96d8a23daf99 100644 (file)
--- a/brc
+++ b/brc
@@ -313,7 +313,7 @@ khcopy() {
 }
 
 a() {
-  local x=$(readlink -nf "$@")
+  local x=$(readlink -nf "${1:-$PWD}")
   # yes, its kinda dumb that xclip/xsel cant do this in one invocation
   echo -n "$x" | xclip -selection clipboard
   echo -n "$x" | xclip
@@ -641,7 +641,7 @@ fa() {
 }
 
 faf() { # find all files
-  find -L $1 -not \( -name .svn -prune -o -name .git -prune \
+  find -L $1 -type f -not \( -name .svn -prune -o -name .git -prune \
        -o -name .hg -prune -o -name .editor-backups -prune \
        -o -name .undo-tree-history -prune \) 2>/dev/null
 }
@@ -1309,15 +1309,14 @@ pfind() { #find *$1* in $PATH
 pkx() { # package extract
   c `mktemp -d`
   pkg=$1
-  cached=$(ls -t /var/cache/apt/archives/$1* | tail -n1)
+  cached=$(ls -t /var/cache/apt/archives/$pkg* | tail -n1)
   if [[ $cached ]]; then
     cp $cached .
   else
     aptitude download $pkg
   fi
   f=(*)
-  dtrx -m $f
-  dtrx -fr $f
+  ex $f
   rm -f $f
 }
 
@@ -1418,6 +1417,17 @@ r() {
 rbpipe() { rbt post -o --diff-filename=- "$@"; }
 rbp() { rbt post -o "$@"; }
 
+resolvcat() {
+  local f
+  f=/etc/resolv.conf
+  echo $f:;  ccat $f
+  hr; echo dnsmasq is $(systemctl is-active dnsmasq)
+  f=/var/run/dnsmasq/resolv.conf
+  hr; echo $f:;  ccat $f
+  f=/etc/dnsmasq-servers.conf
+  hr; echo $f:;  ccat $f
+}
+
 rl() {
   # rsync, root is required to keep permissions right.
   # rsync  --archive --human-readable --verbose --itemize-changes --checksum \(-ahvic\) \
@@ -1555,12 +1565,16 @@ srestart() {
     systemctl restart $service
   fi
 }
-serstopnm() {
+stopnm() {
   ser stop NetworkManager
   ser stop dnsmasq
   s resolvconf -d NetworkManager
   ser start dnsmasq
 }
+startnm() {
+  ser start NetworkManager
+  s nmtui-connect
+}
 
 setini() { # set a value in a .ini style file
   key="$1" value="$2" section="$3" file="$4"
@@ -2278,7 +2292,7 @@ export GOPATH=$HOME/go
 path_add $GOPATH/bin
 path_add /usr/local/go/bin
 
-export ARDUINO_PATH=/a/opt/Arduino/build/linux/work
+export ARDUINO_PATH=/a/opt/arduino-1.8.9
 
 path_add --end ~/.npm-global
 

diff --git a/conflink b/conflink
index b24427fe40737ef5cafff1f96895cc94e191873e..e26be58e0693af8d3ce3ddb9e84bdba8a8e1f636 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -98,7 +98,9 @@ case $USER in
     if [[ -e $f ]]; then
       s chmod 640 $f /etc/prometheus-pass
       s chown root:www-data $f
-      s chown root:prometheus /etc/prometheus-pass
+      if getent passwd prometheus; then
+        s chown root:prometheus /etc/prometheus-pass
+      fi
     fi
 
     ##### end special extra stuff #####

diff --git a/distro-end b/distro-end
index f2df46e6770aa47f79cae78dd5903442f5aa26c0..64441d1cfc9d477847610a3158b8b72ac2f6a438 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -131,6 +131,7 @@ fi
 ###  end docker install ####
 
 
+
 ### begin certbot install ###
 case $distro in
   debian)
@@ -1365,17 +1366,24 @@ esac
 
 case $distro in
   arch)
+    pi virt-install
     # otherwise we get error about accessing kvm module.
     # seems like there might be a better way, but google was a bit vague.
     s $sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
     echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
-    # https://bbs.archlinux.org/viewtopic.php?id=206206
-    # # this should prolly go in the wiki
-    sgo virtlogd.socket
     # guessing this is not needed
     #sgo virtlogd.service
-    sgo libvirtd
+
+    # iank: disabed as im not using libvirt usually
+    # # https://bbs.archlinux.org/viewtopic.php?id=206206
+    # # # this should prolly go in the wiki
+    # sgo virtlogd.socket
+    # sgo libvirtd
     ;;
+  debian|trisquel|ubuntu)
+    pi-nostart virtinst virt-manager
+    ;;
+
 esac
 
 

diff --git a/distro-pkgs b/distro-pkgs
index 21d44621e538e47d73d863b14748094d284c7caf..2267d8ee68ae61c66ab988c55eaf0fc41cb942b7 100755 (executable)
--- a/distro-pkgs
+++ b/distro-pkgs
@@ -170,15 +170,6 @@ case $distro in
     # others unknown
 esac
 
-case $distro in
-    arch) e virt-install;;&
-    debian|trisquel|ubuntu) e virtinst ;;&
-    *) e virt-manager ;; # creates the libvirt group in debian at least
-    # others unknown
-esac
-
-
-
 case $distro in
     arch) e cdrkit;;
     debian|trisquel|ubuntu) e genisoimage;;