nitriques · June 1, 2019 19:01 · Sep 20, 2017 · Aug 10, 2017 · Jun 29, 2017 · Jun 29, 2017
diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -5,12 +5,13 @@ alias grp='grep -B 2 -A 2 -n --color'
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto'
 
-alias la='l -G'
-alias ll='ls -alF'
+alias la='l -Gh'
+alias ll='ls -alFh'
 
 alias reload='source ~/.bash_profile'
 
 alias ..='cd ..'
+alias ...='..;..'
 alias cd..='cd ..'
 alias home='cd ~'
 alias ~='cd ~'

diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -1,5 +1,7 @@
 tabs 4
 
+alias grp='grep -B 2 -A 2 -n --color'
+
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto'
 

diff --git a/.bash_profile-git b/.bash_profile-git
@@ -62,5 +62,11 @@ function greco {
   echo "Checked out" $1
 }
 
+# push to both origin and upstream
+function gpa {
+  g push upstream $@;
+  g push origin $@;
+}
+
 
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -59,6 +59,7 @@ function grel {
 function greco {
   g reset -- $1;
   gco $1;
+  echo "Checked out" $1
 }
 
 

diff --git a/.bash_profile-git b/.bash_profile-git
@@ -55,6 +55,11 @@ function grel {
   gcm "Release ${v}" -S
   gt $1 -s
 }
+# removes a file from the staging area and check it out
+function greco {
+  g reset -- $1;
+  gco $1;
+}
 
 
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -49,5 +49,12 @@ function gcor {
 function gpt {
   git push $1 --tags
 }
+# create release signed commit and signed anotated tag
+function grel {
+  v=$1
+  gcm "Release ${v}" -S
+  gt $1 -s
+}
+
 
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_profile-osx b/.bash_profile-osx
@@ -1,4 +1,6 @@
 export CLICOLOR=1
+export EDITOR=ex
+export VISUAL=vim
 
 alias o='open -a Finder .'
 alias s='open -a "Sublime Text" .'

diff --git a/.bash_aliases-ubuntu b/.bash_aliases-ubuntu
@@ -18,5 +18,7 @@ alias nst='netstat -lntp'
 alias kernels='dpkg --list | grep linux-image-3'
 
 # ubuntu update
-alias update='sudo apt-get update -y && sudo apt-get upgrade -y && sudo apt-get upgrade -y linux-generic linux-headers-generic linux-image-generic'
+export DEBIAN_FRONTEND=noninteractive
+alias update='sudo apt-get update -y && sudo apt-get upgrade -y && sudo apt-get upgrade -y linux-generic linux-headers-generic linux-image-generic && nvm install 7 && nvm install 6 && nvm install 8'
 alias install='sudo dpkg -i'
+
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -6,7 +6,7 @@ alias gco='git checkout'
 alias gwack='git reset --hard HEAD~1'
 alias gd='g --no-pager diff'
 alias gds='gd --staged'
-alias gdw='gd --ignore-space-change'
+alias gdw='gd --ignore-space-change --ignore-space-at-eol'
 alias gdp='git diff'
 alias gb='git branch'
 alias g='git'

diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -53,3 +53,6 @@ function ext {
     $4 mv "$f" "${f%.$1}.$2"
   done
 }
+
+# php lint dirty files
+alias ldp="gs | grep ' M' | awk '/ M (.+)/ { system(\"php -l \" \$2); }'"
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -34,7 +34,7 @@ function gsf {
 }
 # show commit content
 function gsc {
-  gd $1 $1^1 "${@:2}"
+  gd $1^1 $1 "${@:2}"
 }
 function gt {
   v=$1

diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -38,4 +38,18 @@ function 64e {
 }
 
 # php lint all
-alias phplint='for D in **/*.php; do php -l $D; done;'
+alias phplint='for D in **/*.php; do php -l $D; done;'
+
+# extension change
+function ext {
+  if [ -z "$1" ]; then
+    echo "Missing 1st paramter (old ext)"
+    return 1
+  elif [ -z "$2" ]; then
+    echo "Missing 2nd paramter (new ext)"
+    return 2
+  fi
+  find . $3 -name "*.$1" |while read f; do
+    $4 mv "$f" "${f%.$1}.$2"
+  done
+}
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -45,6 +45,9 @@ function gt {
 function gcor {
   gco -b $2 $1/$2
 }
-
+# gpt upstream
+function gpt {
+  git push $1 --tags
+}
 
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -38,4 +38,4 @@ function 64e {
 }
 
 # php lint all
-for D in **/*.php; do php -l $D; done;
+alias phplint='for D in **/*.php; do php -l $D; done;'
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -41,33 +41,6 @@ function gt {
   git tag -a $1 -m "Version ${v}" $2 $3
   echo "Version ${v} created"
 }
-alias gpo='gp origin'
-alias gf='g fetch'
-alias gfo='gf origin'
-alias gdev='gpo dev'
-alias gl="git log --all --graph --pretty=format:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
-function gcat {
-  git cat-file -t $1 && git cat-file -p $@
-}
-# git checkout pull request
-# gcopr upstream 22
-function gcopr {
-  git fetch $1 pull/$2/head:pr-$2
-  git checkout pr-$2
-}
-# show files in a commit
-function gsf {
-  git diff-tree --no-commit-id --name-only -r $@
-}
-# show commit content
-function gsc {
-  gd $1 $1^1 "${@:2}"
-}
-function gt {
-  v=$1
-  git tag -a $1 -m "Version ${v}" $2 $3
-  echo "Version ${v} created"
-}
 # checkout remote gcor origin branch
 function gcor {
   gco -b $2 $1/$2

diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -35,4 +35,7 @@ function 64d {
 }
 function 64e {
         node -e "console.log(new Buffer(process.argv[1]).toString('base64'))" $@
-}
+}
+
+# php lint all
+for D in **/*.php; do php -l $D; done;
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -41,5 +41,37 @@ function gt {
   git tag -a $1 -m "Version ${v}" $2 $3
   echo "Version ${v} created"
 }
+alias gpo='gp origin'
+alias gf='g fetch'
+alias gfo='gf origin'
+alias gdev='gpo dev'
+alias gl="git log --all --graph --pretty=format:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
+function gcat {
+  git cat-file -t $1 && git cat-file -p $@
+}
+# git checkout pull request
+# gcopr upstream 22
+function gcopr {
+  git fetch $1 pull/$2/head:pr-$2
+  git checkout pr-$2
+}
+# show files in a commit
+function gsf {
+  git diff-tree --no-commit-id --name-only -r $@
+}
+# show commit content
+function gsc {
+  gd $1 $1^1 "${@:2}"
+}
+function gt {
+  v=$1
+  git tag -a $1 -m "Version ${v}" $2 $3
+  echo "Version ${v} created"
+}
+# checkout remote gcor origin branch
+function gcor {
+  gco -b $2 $1/$2
+}
+
 
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_aliases-ubuntu b/.bash_aliases-ubuntu
@@ -18,5 +18,5 @@ alias nst='netstat -lntp'
 alias kernels='dpkg --list | grep linux-image-3'
 
 # ubuntu update
-alias update='sudo apt-get update && sudo apt-get upgrade && sudo apt-get upgrade linux-generic linux-headers-generic linux-image-generic'
+alias update='sudo apt-get update -y && sudo apt-get upgrade -y && sudo apt-get upgrade -y linux-generic linux-headers-generic linux-image-generic'
 alias install='sudo dpkg -i'
diff --git a/.bash_aliases-ubuntu b/.bash_aliases-ubuntu
@@ -19,3 +19,4 @@ alias kernels='dpkg --list | grep linux-image-3'
 
 # ubuntu update
 alias update='sudo apt-get update && sudo apt-get upgrade && sudo apt-get upgrade linux-generic linux-headers-generic linux-image-generic'
+alias install='sudo dpkg -i'
diff --git a/.bash_profile-windows b/.bash_profile-windows
@@ -8,3 +8,5 @@ alias s='subl .'
 alias ab='start "" //B //WAIT "C:\Program Files (x86)\Apache Software Foundation\Apache2.2\bin\ab.exe" '
 
 export SVN_EDITOR='"C:\Program Files\Git\usr\bin\vim.exe"'
+
+alias ncu='winpty ncu.cmd' 
diff --git a/.bash_aliases-ubuntu b/.bash_aliases-ubuntu
@@ -16,3 +16,6 @@ alias disku='du -s -h'
 alias nst='netstat -lntp'
 
 alias kernels='dpkg --list | grep linux-image-3'
+
+# ubuntu update
+alias update='sudo apt-get update && sudo apt-get upgrade && sudo apt-get upgrade linux-generic linux-headers-generic linux-image-generic'
diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -28,3 +28,11 @@ function topp {
 
 # http header
 alias hh='curl -Is'
+
+# base 64
+function 64d {
+        node -e "console.log(new Buffer(process.argv[1], 'base64').toString())" $@
+}
+function 64e {
+        node -e "console.log(new Buffer(process.argv[1]).toString('base64'))" $@
+}
diff --git a/.bash_profile-git b/.bash_profile-git
@@ -36,5 +36,10 @@ function gsf {
 function gsc {
   gd $1 $1^1 "${@:2}"
 }
+function gt {
+  v=$1
+  git tag -a $1 -m "Version ${v}" $2 $3
+  echo "Version ${v} created"
+}
 
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -12,6 +12,7 @@ alias ..='cd ..'
 alias cd..='cd ..'
 alias home='cd ~'
 alias ~='cd ~'
+alias cd-='cd -'
 
 function t {
   z $@ trunk

diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -23,4 +23,7 @@ function topp {
   pattern=$1
   shift 1
   top -p $(pgrep -d',' $pattern) $@
-}
+}
+
+# http header
+alias hh='curl -Is'
diff --git a/.bash_profile-svn b/.bash_profile-svn
@@ -8,6 +8,9 @@ alias svn-ignore="svn propedit svn:ignore"
 function sd {
   svn diff $@ | colordiff
 }
+function sdw {
+  sd -x -w $@
+}
 function svnlol {
   svn log $@ | perl -l40pe 's/^-+/\n/'
 }

diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -1,3 +1,5 @@
+tabs 4
+
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto'
 

diff --git a/.bash_profile-workspace b/.bash_profile-workspace
@@ -1,4 +1,6 @@
 alias w='cd workspace/assets/'
 alias b='.. && ..'
-alias v='cat package.json | grep version'
-alias build='w;grunt;v;b'
+alias v='cat package.json | jq .version'
+alias bn='cat build.json | jq .lastBuild'
+alias build='w;grunt;v;bn;b'
+alias buildpush='sup;w;grunt build push --force;v;bn;b'
diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -1,7 +1,7 @@
 alias l='ls --color=auto -F'
 alias ls='ls --color=auto'
 
-alias la='ls -la'
+alias la='l -G'
 alias ll='ls -alF'
 
 alias reload='source ~/.bash_profile'

diff --git a/.bash_profile-git b/.bash_profile-git
@@ -32,4 +32,9 @@ function gcopr {
 function gsf {
   git diff-tree --no-commit-id --name-only -r $@
 }
+# show commit content
+function gsc {
+  gd $1 $1^1 "${@:2}"
+}
+
 alias gim='~/git-imerge/git-imerge'
diff --git a/.bash_profile-bash b/.bash_profile-bash
@@ -11,6 +11,10 @@ alias cd..='cd ..'
 alias home='cd ~'
 alias ~='cd ~'
 
+function t {
+  z $@ trunk
+}
+
 # this function calls top with a command filter (1st arg)
 # other parameters are passed down to top
 function topp {