Skip to content

Commit 2a651f0

Browse files
committed
Generate symlink for sh & updated dependencies
1 parent c3424eb commit 2a651f0

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@
7272
"nodeos-cross-toolchain": "^1.0.0-RC3.1",
7373
"nodeos-nodejs": "^6.9.5-0",
7474
"nodeos-reverse-proxy": "^0.1.1",
75-
"npm": "^4.5.0",
76-
"bin-nsh": "^0.5.1",
75+
"npm": "^4.6.1",
76+
"bin-nsh": "^0.5.2",
7777
"ntp-client": "^0.5.3",
7878
"palmtree": "^2.6.0",
7979
"performance": "^1.1.1",

scripts/build

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,20 +95,23 @@ if [[ ! -d $STEP_DIR ]]; then
9595
PACKAGES=`node -p "require('./package.json').nodeosDependenciesNodeos.join(' ')"`
9696
eval "$NPMi" -g $PACKAGES || exit 22
9797

98+
# Set `nsh` as default `sh` shell
99+
ln -s nsh $STEP_DIR/bin/sh || exit 23
100+
98101

99102
#
100103
# Copy nodeos user login info
101104
#
102105

103106
mkdir -p $STEP_DIR/etc &&
104-
cp resources/logon.json $STEP_DIR/etc/ || exit 23
107+
cp resources/logon.json $STEP_DIR/etc/ || exit 24
105108

106109

107110
#
108111
# Dummy init file for the user
109112
#
110113

111-
cp resources/init.js $STEP_DIR/init || exit 24
114+
cp resources/init.js $STEP_DIR/init || exit 25
112115

113116

114117
#
@@ -123,7 +126,7 @@ if [[ ! -d $STEP_DIR ]]; then
123126
(
124127
cd $SRC_DIR
125128

126-
eval "$NPMi" || exit 25
129+
eval "$NPMi" || exit 26
127130
) || exit $?
128131

129132

@@ -139,7 +142,7 @@ if [[ ! -d $STEP_DIR ]]; then
139142
# (
140143
# cd $SRC_DIR
141144
#
142-
# eval "$NPMi" --has_cairo=false --has_X11=false || exit 26
145+
# eval "$NPMi" --has_cairo=false --has_X11=false || exit 27
143146
# ) || exit $?
144147
) || err $?
145148

0 commit comments

Comments
 (0)