@modernpoacher/deps 2.2.4 → 2.2.6

package/bin/bash/deps.sh

@@ -3,6 +3,7 @@
 # https://google.github.io/styleguide/shellguide.html#s7-naming-conventions
 
 DIR="$(dirname "$0")"
+BIN="$(realpath "$DIR/..")"
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -10,11 +11,11 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
@@ -22,6 +23,9 @@ echo SSH auth sock is $SSH_AUTH_SOCK
 echo Home is $HOME
 echo Path is $PATH
 
+echo DIR is $DIR
+echo BIN is $BIN
+
 EXP="[-0-9a-zA-Z]*$"
 
 function update {

package/bin/bash/head.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 DIR="$(dirname "$0")"
+BIN="$(realpath "$DIR/..")"
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,11 +9,11 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
@@ -20,6 +21,9 @@ echo SSH auth sock is $SSH_AUTH_SOCK
 echo Home is $HOME
 echo Path is $PATH
 
+echo DIR is $DIR
+echo BIN is $BIN
+
 EXP="[-0-9a-zA-Z]*$"
 
 function report {

package/bin/bash/push.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 DIR="$(dirname "$0")"
+BIN="$(realpath "$DIR/..")"
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,11 +9,11 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
@@ -20,6 +21,9 @@ echo SSH auth sock is $SSH_AUTH_SOCK
 echo Home is $HOME
 echo Path is $PATH
 
+echo DIR is $DIR
+echo BIN is $BIN
+
 EXP="[-0-9a-zA-Z]*$"
 
 function report {

package/bin/bash/wipe.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 DIR="$(dirname "$0")"
+BIN="$(realpath "$DIR/..")"
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,11 +9,11 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
@@ -20,6 +21,9 @@ echo SSH auth sock is $SSH_AUTH_SOCK
 echo Home is $HOME
 echo Path is $PATH
 
+echo DIR is $DIR
+echo BIN is $BIN
+
 EXP="[-0-9a-zA-Z]*$"
 
 function report {

package/bin/deps/deps.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 DIR="$(dirname $(readlink -f "$0"))"
+BIN="$(realpath "$DIR/..")"
+
+echo DIR is $DIR
+echo BIN is $BIN
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,13 +12,12 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
-BIN="$(realpath "$DIR/..")"
 node "$BIN/node/deps.mjs" "$@"

package/bin/deps/execute.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 DIR="$(dirname $(readlink -f "$0"))"
+BIN="$(realpath "$DIR/..")"
+
+echo DIR is $DIR
+echo BIN is $BIN
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,13 +12,12 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
-BIN="$(realpath "$DIR/..")"
 node "$BIN/node/execute.mjs" "$@"

package/bin/deps/head.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 DIR="$(dirname $(readlink -f "$0"))"
+BIN="$(realpath "$DIR/..")"
+
+echo DIR is $DIR
+echo BIN is $BIN
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,13 +12,12 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
-BIN="$(realpath "$DIR/..")"
 node "$BIN/node/head.mjs" "$@"

package/bin/deps/install.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 DIR="$(dirname $(readlink -f "$0"))"
+BIN="$(realpath "$DIR/..")"
+
+echo DIR is $DIR
+echo BIN is $BIN
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,13 +12,12 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
-BIN="$(realpath "$DIR/..")"
 node "$BIN/node/install.mjs" "$@"

package/bin/deps/push.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 DIR="$(dirname $(readlink -f "$0"))"
+BIN="$(realpath "$DIR/..")"
+
+echo DIR is $DIR
+echo BIN is $BIN
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,13 +12,12 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
-BIN="$(realpath "$DIR/..")"
 node "$BIN/node/push.mjs" "$@"

package/bin/deps/wipe.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
 DIR="$(dirname $(readlink -f "$0"))"
+BIN="$(realpath "$DIR/..")"
+
+echo DIR is $DIR
+echo BIN is $BIN
 
 NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
@@ -8,13 +12,12 @@ export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=Exper
 
 if [ -f "$HOME/.zshrc" ];
 then
-  zsh "$DIR/z.sh"
+  zsh "$BIN/z.sh"
 else
   if [ -f "$HOME/.bashrc" ];
   then
-    bash "$DIR/b.sh"
+    bash "$BIN/b.sh"
   fi
 fi
 
-BIN="$(realpath "$DIR/..")"
 node "$BIN/node/wipe.mjs" "$@"

package/bin/deps.sh

@@ -6,6 +6,8 @@ NODE_OPTIONS="${NODE_OPTIONS:---disable-warning=ExperimentalWarning}"
 
 export NODE_OPTIONS=$NODE_OPTIONS # export NODE_OPTIONS='--disable-warning=ExperimentalWarning'
 
+echo "$DIR/z.sh"
+
 if [ -f "$HOME/.zshrc" ];
 then
   zsh "$DIR/z.sh"

package/bin/node/deps.mjs

@@ -2,8 +2,6 @@
 
 import debug from 'debug'
 
-import PATH from '#where-am-i'
-
 import {
   exec
 } from 'node:child_process'
@@ -19,7 +17,8 @@ import {
 } from '#deps/bin/common'
 
 import {
-  PLATFORM
+  PLATFORM,
+  BIN
 } from '#deps/src/common/env'
 
 import {
@@ -36,8 +35,8 @@ debug.enable(DEBUG)
 
 const command = (
   PLATFORM === 'win32'
-    ? `bash "${join(PATH, '.\\bin\\bash\\deps.sh')}"`
-    : `bash '${join(PATH, './bin/bash/deps.sh')}'`
+    ? `bash "${join(BIN, '.\\bash\\deps.sh')}"`
+    : `bash '${join(BIN, './bash/deps.sh')}'`
 )
 
 const args = getArgs()

package/bin/node/head.mjs

@@ -2,8 +2,6 @@
 
 import debug from 'debug'
 
-import PATH from '#where-am-i'
-
 import {
   exec
 } from 'node:child_process'
@@ -19,7 +17,8 @@ import {
 } from '#deps/bin/common'
 
 import {
-  PLATFORM
+  PLATFORM,
+  BIN
 } from '#deps/src/common/env'
 
 import {
@@ -36,8 +35,8 @@ debug.enable(DEBUG)
 
 const command = (
   PLATFORM === 'win32'
-    ? `bash "${join(PATH, '.\\bin\\bash\\head.sh')}"`
-    : `bash '${join(PATH, './bin/bash/head.sh')}'`
+    ? `bash "${join(BIN, '.\\bash\\head.sh')}"`
+    : `bash '${join(BIN, './bash/head.sh')}'`
 )
 
 const args = getArgs()

package/bin/node/push.mjs

@@ -2,8 +2,6 @@
 
 import debug from 'debug'
 
-import PATH from '#where-am-i'
-
 import {
   exec
 } from 'node:child_process'
@@ -19,7 +17,8 @@ import {
 } from '#deps/bin/common'
 
 import {
-  PLATFORM
+  PLATFORM,
+  BIN
 } from '#deps/src/common/env'
 
 import {
@@ -36,8 +35,8 @@ debug.enable(DEBUG)
 
 const command = (
   PLATFORM === 'win32'
-    ? `bash "${join(PATH, '.\\bin\\bash\\push.sh')}"`
-    : `bash '${join(PATH, './bin/bash/push.sh')}'`
+    ? `bash "${join(BIN, '.\\bash\\push.sh')}"`
+    : `bash '${join(BIN, './bash/push.sh')}'`
 )
 
 const args = getArgs()

package/bin/node/wipe.mjs

@@ -2,8 +2,6 @@
 
 import debug from 'debug'
 
-import PATH from '#where-am-i'
-
 import {
   exec
 } from 'node:child_process'
@@ -19,7 +17,8 @@ import {
 } from '#deps/bin/common'
 
 import {
-  PLATFORM
+  PLATFORM,
+  BIN
 } from '#deps/src/common/env'
 
 import {
@@ -36,8 +35,8 @@ debug.enable(DEBUG)
 
 const command = (
   PLATFORM === 'win32'
-    ? `bash "${join(PATH, '.\\bin\\bash\\wipe.sh')}"`
-    : `bash '${join(PATH, './bin/bash/wipe.sh')}'`
+    ? `bash "${join(BIN, '.\\bash\\wipe.sh')}"`
+    : `bash '${join(BIN, './bash/wipe.sh')}'`
 )
 
 const args = getArgs()

package/package.json

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

package/src/common/env/index.mjs

@@ -27,9 +27,9 @@ const {
   }
 } = process
 
-const BASH = PLATFORM === 'win32'
-  ? join(PATH, '.\\bin\\bash')
-  : join(PATH, './bin/bash')
+const BIN = PLATFORM === 'win32'
+  ? join(PATH, '.\\bin') // \\bash')
+  : join(PATH, './bin') // /bash')
 
 const log = debug('@modernpoacher/deps')
 
@@ -40,5 +40,5 @@ export {
   VERSION,
   PLATFORM,
   HOME,
-  BASH
+  BIN
 }

package/src/common/git/index.mjs

@@ -12,7 +12,7 @@ import {
 
 import {
   HOME,
-  BASH,
+  BIN,
   VERSION,
   PLATFORM
 } from '#deps/src/common/env'
@@ -42,11 +42,11 @@ echo "\${BASH_REMATCH[0]}"
 const GIT_PULL = `
 if [ -f "${HOME}/.zshrc" ];
 then
-  zsh "${BASH}/z.sh"
+  zsh "${BIN}/z.sh"
 else
   if [ -f "${HOME}/.bashrc" ];
   then
-    bash "${BASH}/b.sh"
+    bash "${BIN}/b.sh"
   fi
 fi
 
@@ -56,11 +56,11 @@ git pull
 const GIT_PUSH = `
 if [ -f "${HOME}/.zshrc" ];
 then
-  zsh "${BASH}/z.sh"
+  zsh "${BIN}/z.sh"
 else
   if [ -f "${HOME}/.bashrc" ];
   then
-    bash "${BASH}/b.sh"
+    bash "${BIN}/b.sh"
   fi
 fi
 
@@ -70,11 +70,11 @@ git push
 const GIT_PUSH_TAGS = `
 if [ -f "${HOME}/.zshrc" ];
 then
-  zsh "${BASH}/z.sh"
+  zsh "${BIN}/z.sh"
 else
   if [ -f "${HOME}/.bashrc" ];
   then
-    bash "${BASH}/b.sh"
+    bash "${BIN}/b.sh"
   fi
 fi
 

package/bin/bash/b.sh

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

package/bin/bash/z.sh

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

package/bin/deps/b.sh

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

package/bin/deps/z.sh

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