Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge 31ce185712 into f18bdeab6c

Browse source
This commit is contained in:
Dimazhan 2018-08-25 22:08:38 +00:00 committed by GitHub
commit 0d0b4057ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
cjdns/patches/100-nodejs.patch Normal file
View file

@ -0,0 +1,41 @@
diff --git a/node_build/node.sh b/node_build/node.sh
index f6b9291..b98ecd8 100755
--- a/node_build/node.sh
+++ b/node_build/node.sh
@@ -125,19 +125,23 @@ getNode() {
"$INSTALL_PATH" -d "$NODEDIR/nodejs"
cd "$NODEDIR/nodejs"
- node_dl="node-${DLVER}.tar.gz"
- if cmdExists wget; then
- printf '\n%s %s ' '==>' "Downloading $NODEURL with wget..."
- wget -q "$NODEURL" -O "$node_dl" || die "failed to download $NODEURL";
- elif cmdExists curl; then
- printf '%s %s ' '==>' "Downloading $NODEURL with curl..."
- curl -s "$NODEURL" > "$node_dl" || die "failed to download $NODEURL";
- elif cmdExists fetch; then
- printf '%s %s ' '==>' "Downloading $NODEURL with fetch..."
- fetch "$NODEURL" -o "$node_dl" || die "failed to download $NODEURL";
- else
- die 'wget, curl or fetch is required download node.js but you have none!'
- fi
+ DL_DIR=$(cat ../../../../../.config | grep CONFIG_DOWNLOAD_FOLDER | cut -d\" -f2)
+ [ "$DL_DIR" = "" ] && DL_DIR="../../../../../dl"
+ node_dl="${DL_DIR}/node-$DLVER-$PLATFORM-$march.tar.gz"
+ if [ ! -f "$node_dl" ]; then
+ if cmdExists wget; then
+ printf '\n%s %s ' '==>' "Downloading $NODEURL with wget..."
+ wget -q "$NODEURL" -O "$node_dl" || die "failed to download $NODEURL";
+ elif cmdExists curl; then
+ printf '%s %s ' '==>' "Downloading $NODEURL with curl..."
+ curl -s "$NODEURL" > "$node_dl" || die "failed to download $NODEURL";
+ elif cmdExists fetch; then
+ printf '%s %s ' '==>' "Downloading $NODEURL with fetch..."
+ fetch "$NODEURL" -o "$node_dl" || die "failed to download $NODEURL";
+ else
+ die 'wget, curl or fetch is required download node.js but you have none!'
+ fi
+ fi
[ -f "$node_dl" ] || die 'Failed to download node.js'
printf '%s\n' 'DONE!'