@modernpoacher/deps 2.1.24 → 2.1.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/bin/bash/deps.sh +2 -6
  2. package/bin/bash/push.sh +2 -6
  3. package/bin/bash/wipe.sh +2 -6
  4. package/package.json +1 -1
  5. package/src/common/git/index.mjs +6 -18
package/bin/bash/deps.sh CHANGED
@@ -7,11 +7,7 @@ export PATH=/usr/local/bin:$PATH
7
7
  EXP="[-0-9a-zA-Z]*$"
8
8
 
9
9
  function update {
10
- if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
11
- then
12
- eval $(ssh-agent -s)
13
- trap "ssh-agent -k" exit
14
- fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
10
+ eval "$(ssh-agent -s)" 1> /dev/null # eval $(ssh-agent) 1> /dev/null
15
11
  ssh -vT git@github.com
16
12
  git checkout $default_branch
17
13
  git pull
@@ -24,7 +20,7 @@ fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
24
20
  git commit -m "Updated \`package.json\` &/ \`package-lock.json\`"
25
21
  git push
26
22
  git push --tags
27
- # eval $(ssh-agent -k) 1> /dev/null
23
+ eval "$(ssh-agent -k)" 1> /dev/null
28
24
  }
29
25
 
30
26
  function can_update {
package/bin/bash/push.sh CHANGED
@@ -54,16 +54,12 @@ function checkout_default_branch {
54
54
  }
55
55
 
56
56
  function update {
57
- if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
58
- then
59
- eval $(ssh-agent -s)
60
- trap "ssh-agent -k" exit
61
- fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
57
+ eval "$(ssh-agent -s)" 1> /dev/null # eval $(ssh-agent) 1> /dev/null
62
58
  ssh -vT git@github.com
63
59
  git pull
64
60
  git push
65
61
  git push --tags
66
- # eval $(ssh-agent -k) 1> /dev/null
62
+ eval "$(ssh-agent -k)" 1> /dev/null
67
63
  }
68
64
 
69
65
  function execute {
package/bin/bash/wipe.sh CHANGED
@@ -54,17 +54,13 @@ function checkout_default_branch {
54
54
  }
55
55
 
56
56
  function update {
57
- if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
58
- then
59
- eval $(ssh-agent -s)
60
- trap "ssh-agent -k" exit
61
- fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
57
+ eval "$(ssh-agent -s)" 1> /dev/null # eval $(ssh-agent) 1> /dev/null
62
58
  ssh -vT git@github.com
63
59
  git pull
64
60
  git branch --merged | egrep -v "(^\*|$default_branch)" | xargs git branch -d
65
61
  git remote prune origin
66
62
  git gc --aggressive --prune=now
67
- # eval $(ssh-agent -k) 1> /dev/null
63
+ eval "$(ssh-agent -k)" 1> /dev/null
68
64
  }
69
65
 
70
66
  function execute {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@modernpoacher/deps",
3
- "version": "2.1.24",
3
+ "version": "2.1.25",
4
4
  "description": "Update NPM package dependencies from the command line",
5
5
  "keywords": [
6
6
  "deps",
package/src/common/git/index.mjs CHANGED
@@ -38,36 +38,24 @@ echo "\${BASH_REMATCH[0]}"
38
38
  `
39
39
 
40
40
  const GIT_PULL = `
41
- if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
42
- then
43
- eval $(ssh-agent -s)
44
- trap "ssh-agent -k" exit
45
- fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
41
+ eval "$(ssh-agent -s)" 1> /dev/null # eval $(ssh-agent) 1> /dev/null
46
42
  ssh -vT git@github.com
47
43
  git pull
48
- # eval $(ssh-agent -k) 1> /dev/null
44
+ eval "$(ssh-agent -k)" 1> /dev/null
49
45
  `
50
46
 
51
47
  const GIT_PUSH = `
52
- if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
53
- then
54
- eval $(ssh-agent -s)
55
- trap "ssh-agent -k" exit
56
- fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
48
+ eval "$(ssh-agent -s)" 1> /dev/null # eval $(ssh-agent) 1> /dev/null
57
49
  ssh -vT git@github.com
58
50
  git push
59
- # eval $(ssh-agent -k) 1> /dev/null
51
+ eval "$(ssh-agent -k)" 1> /dev/null
60
52
  `
61
53
 
62
54
  const GIT_PUSH_TAGS = `
63
- if [ $(ps ax | grep ssh-agent | wc -l) -eq 0 ];
64
- then
65
- eval $(ssh-agent -s)
66
- trap "ssh-agent -k" exit
67
- fi # eval "$(ssh-agent -s)" # eval $(ssh-agent) 1> /dev/null
55
+ eval "$(ssh-agent -s)" 1> /dev/null # eval $(ssh-agent) 1> /dev/null
68
56
  ssh -vT git@github.com
69
57
  git push --tags
70
- # eval $(ssh-agent -k) 1> /dev/null
58
+ eval "$(ssh-agent -k)" 1> /dev/null
71
59
  `
72
60
 
73
61
  const log = debug('@modernpoacher/deps')