X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=brc;h=f0ae687d29cd6173c4735e937d1b96d8a23daf99;hb=1f524e72136f1d10548bdc4f502c6405ba6dbcd0;hp=84386907d92e1f4f53683068ac70ec77d73d48c5;hpb=77f3e699ab79d597d22fc052ed03d25cf0ad02da;p=distro-setup

diff --git a/brc b/brc
index 8438690..f0ae687 100644
--- 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
@@ -331,14 +331,19 @@ anki() {
 
 ap() {
   # pushd in case current directory has an ansible.cfg file
-  pushd /a/xans
+  pushd /a/xans >/dev/null
   ansible-playbook -v -l ${1:- $(hostname -f)} site.yml
-  popd
+  popd >/dev/null
 }
 aw() {
-  pushd /a/work/ansible-configs
+  pushd /a/work/ansible-configs >/dev/null
   time ansible-playbook -v -i inventory adhoc.yml "$@"
-  popd
+  popd >/dev/null
+}
+ad() {
+  pushd /a/bin/distro-setup/a >/dev/null
+  ansible-playbook site.yml
+  popd >/dev/null
 }
 
 astudio() {
@@ -378,12 +383,21 @@ bigclock() {
 }
 
 bpull() {
+  [[ $1 ]] || return 1
+  c /
+  # run latest
+  install-my-scripts
+  switch-mail-host $1 $HOSTNAME
+}
+bpush() {
+  [[ $1 ]] || return 1
   c /
   # run latest
   install-my-scripts
-  switch-mail-host $1 $HOSTNAMEs
+  switch-mail-host $HOSTNAME $1
 }
 
+
 btc() {
   local f=/etc/bitcoin/bitcoin.conf
   # importprivkey will timeout if using the default of 15 mins.
@@ -627,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
 }
@@ -1295,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
 }
 
@@ -1404,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\) \
@@ -1541,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"
@@ -2264,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