@modernpoacher/deps 2.1.24 → 2.1.26

package/bin/bash/b.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cd "$HOME"
+
+if [ -f .bashrc ];
+then
+  source .bashrc
+
+  export ZSH_AUTH_SOCK=$ZSH_AUTH_SOCK
+  export PATH=$PATH
+  export HOME=$HOME
+fi
+
+exit 0

package/bin/bash/deps.sh

@@ -2,17 +2,25 @@
 #
 # https://google.github.io/styleguide/shellguide.html#s7-naming-conventions
 
-export PATH=/usr/local/bin:$PATH
+DIR="$(dirname "$0")"
+
+if [ -f "$HOME/.zshrc" ];
+then
+  zsh "$DIR/z.sh"
+else
+  if [ -f "$HOME/.bashrc" ];
+  then
+    bash "$DIR/b.sh"
+  fi
+fi
+
+echo SSH auth sock is $SSH_AUTH_SOCK
+echo Home is $HOME
+echo Path is $PATH
 
 EXP="[-0-9a-zA-Z]*$"
 
 function update {
-  if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
-then
-  eval $(ssh-agent -s)
-  trap "ssh-agent -k" exit
-fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
-  ssh -vT git@github.com
   git checkout $default_branch
   git pull
 
@@ -24,7 +32,6 @@ fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
   git commit -m "Updated \`package.json\` &/ \`package-lock.json\`"
   git push
   git push --tags
-  # eval $(ssh-agent -k) 1> /dev/null
 }
 
 function can_update {

package/bin/bash/head.sh

@@ -1,6 +1,20 @@
 #!/bin/bash
 
-export PATH=/usr/local/bin:$PATH
+DIR="$(dirname "$0")"
+
+if [ -f "$HOME/.zshrc" ];
+then
+  zsh "$DIR/z.sh"
+else
+  if [ -f "$HOME/.bashrc" ];
+  then
+    bash "$DIR/b.sh"
+  fi
+fi
+
+echo SSH auth sock is $SSH_AUTH_SOCK
+echo Home is $HOME
+echo Path is $PATH
 
 EXP="[-0-9a-zA-Z]*$"
 

package/bin/bash/push.sh

@@ -1,6 +1,20 @@
 #!/bin/bash
 
-export PATH=/usr/local/bin:$PATH
+DIR="$(dirname "$0")"
+
+if [ -f "$HOME/.zshrc" ];
+then
+  zsh "$DIR/z.sh"
+else
+  if [ -f "$HOME/.bashrc" ];
+  then
+    bash "$DIR/b.sh"
+  fi
+fi
+
+echo SSH auth sock is $SSH_AUTH_SOCK
+echo Home is $HOME
+echo Path is $PATH
 
 EXP="[-0-9a-zA-Z]*$"
 
@@ -54,16 +68,9 @@ function checkout_default_branch {
 }
 
 function update {
-  if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
-then
-  eval $(ssh-agent -s)
-  trap "ssh-agent -k" exit
-fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
-  ssh -vT git@github.com
   git pull
   git push
   git push --tags
-  # eval $(ssh-agent -k) 1> /dev/null
 }
 
 function execute {

package/bin/bash/wipe.sh

@@ -1,6 +1,20 @@
 #!/bin/bash
 
-export PATH=/usr/local/bin:$PATH
+DIR="$(dirname "$0")"
+
+if [ -f "$HOME/.zshrc" ];
+then
+  zsh "$DIR/z.sh"
+else
+  if [ -f "$HOME/.bashrc" ];
+  then
+    bash "$DIR/b.sh"
+  fi
+fi
+
+echo SSH auth sock is $SSH_AUTH_SOCK
+echo Home is $HOME
+echo Path is $PATH
 
 EXP="[-0-9a-zA-Z]*$"
 
@@ -54,17 +68,10 @@ function checkout_default_branch {
 }
 
 function update {
-  if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
-then
-  eval $(ssh-agent -s)
-  trap "ssh-agent -k" exit
-fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
-  ssh -vT git@github.com
   git pull
   git branch --merged | egrep -v "(^\*|$default_branch)" | xargs git branch -d
   git remote prune origin
   git gc --aggressive --prune=now
-  # eval $(ssh-agent -k) 1> /dev/null
 }
 
 function execute {

package/bin/bash/z.sh

@@ -0,0 +1,14 @@
+#!/bin/zsh
+
+cd "$HOME"
+
+if [ -f .zshrc ];
+then
+  source .zshrc
+
+  export ZSH_AUTH_SOCK=$ZSH_AUTH_SOCK
+  export PATH=$PATH
+  export HOME=$HOME
+fi
+
+cd "$CWD"

package/bin/get-default-branch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/zsh
 
 export PATH=/usr/local/bin:$PATH
 

package/nvm.sh

@@ -1,4 +1,4 @@
-#!/bin/bash +e
+#!/bin/zsh +e
 
 NVM=~/.nvm
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernpoacher/deps",
-  "version": "2.1.24",
+  "version": "2.1.26",
   "description": "Update NPM package dependencies from the command line",
   "keywords": [
     "deps",

package/src/common/env/index.mjs

@@ -14,6 +14,14 @@ import {
   platform
 } from 'node:os'
 
+const {
+  env: {
+    HOME
+  }
+} = process
+
+const BASH = join(PATH, 'bin/bash')
+
 const {
   name: NAME,
   version: VERSION
@@ -26,6 +34,8 @@ const log = debug('@modernpoacher/deps')
 log(`\`common/env\` (${NAME} - ${VERSION} - ${PLATFORM}) is awake`)
 
 export {
+  HOME,
+  BASH,
   NAME,
   VERSION,
   PLATFORM

package/src/common/git/index.mjs

@@ -11,6 +11,8 @@ import {
 } from 'node:child_process'
 
 import {
+  HOME,
+  BASH,
   VERSION,
   PLATFORM
 } from '#deps/src/common/env'
@@ -38,36 +40,45 @@ echo "\${BASH_REMATCH[0]}"
 `
 
 const GIT_PULL = `
-if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
+if [ -f "${HOME}/.zshrc" ];
 then
-  eval $(ssh-agent -s)
-  trap "ssh-agent -k" exit
-fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
-ssh -vT git@github.com
+  zsh "${BASH}/z.sh"
+else
+  if [ -f "${HOME}/.bashrc" ];
+  then
+    bash "${BASH}/b.sh"
+  fi
+fi
+
 git pull
-# eval $(ssh-agent -k) 1> /dev/null
 `
 
 const GIT_PUSH = `
-if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
+if [ -f "${HOME}/.zshrc" ];
 then
-  eval $(ssh-agent -s)
-  trap "ssh-agent -k" exit
-fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
-ssh -vT git@github.com
+  zsh "${BASH}/z.sh"
+else
+  if [ -f "${HOME}/.bashrc" ];
+  then
+    bash "${BASH}/b.sh"
+  fi
+fi
+
 git push
-# eval $(ssh-agent -k) 1> /dev/null
 `
 
 const GIT_PUSH_TAGS = `
-if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
+if [ -f "${HOME}/.zshrc" ];
 then
-  eval $(ssh-agent -s)
-  trap "ssh-agent -k" exit
-fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
-ssh -vT git@github.com
+  zsh "${BASH}/z.sh"
+else
+  if [ -f "${HOME}/.bashrc" ];
+  then
+    bash "${BASH}/b.sh"
+  fi
+fi
+
 git push --tags
-# eval $(ssh-agent -k) 1> /dev/null
 `
 
 const log = debug('@modernpoacher/deps')

package/src/common/index.mjs

@@ -38,7 +38,7 @@ import debug from 'debug'
 import PATH from '#where-am-i'
 
 import {
-  resolve
+  join
 } from 'node:path'
 
 import {
@@ -52,7 +52,7 @@ export const REGISTRY = 'https://registry.npmjs.org'
 
 export const AUTHOR = 'Modern Poacher Limited <modernpoacher@modernpoacher.com>'
 
-export const NVM = resolve(PATH, 'nvm.sh')
+export const NVM = join(PATH, 'nvm.sh')
 
 const log = debug('@modernpoacher/deps')
 

package/src/common/options/index.mjs

@@ -7,6 +7,8 @@ import {
 
 const {
   env: {
+    SSH_AUTH_SOCK,
+    HOME,
     PATH
   }
 } = process
@@ -19,6 +21,8 @@ export const OPTIONS = {
     FORCE_COLOR: PLATFORM === 'win32'
       ? 3
       : 2,
+    SSH_AUTH_SOCK,
+    HOME,
     PATH
   }
 }