浏览代码

Ensure npm version is installed

Bob Mottram 8 年前
父节点
当前提交
098e269261
共有 2 个文件被更改,包括 6 次插入1 次删除
  1. 4
    0
      src/freedombone-app-jitsi
  2. 2
    1
      src/freedombone-utils-nodejs

+ 4
- 0
src/freedombone-app-jitsi 查看文件

223
     apt-get -yq install wget debconf-utils default-jre
223
     apt-get -yq install wget debconf-utils default-jre
224
     install_nodejs jitsi
224
     install_nodejs jitsi
225
     npm install -g browserify@13.1.1
225
     npm install -g browserify@13.1.1
226
+    if [ ! "$?" = "0" ]; then
227
+        remove_nodejs jitsi
228
+        exit 638352
229
+    fi
226
     if ! grep "jitsi" /etc/apt/sources.list; then
230
     if ! grep "jitsi" /etc/apt/sources.list; then
227
         echo "deb http://download.jitsi.org/nightly/deb ${jitsi_deb_repo}/" >> /etc/apt/sources.list
231
         echo "deb http://download.jitsi.org/nightly/deb ${jitsi_deb_repo}/" >> /etc/apt/sources.list
228
     fi
232
     fi

+ 2
- 1
src/freedombone-utils-nodejs 查看文件

129
 cp /usr/bin/nodejs /usr/local/bin/node
129
 cp /usr/bin/nodejs /usr/local/bin/node
130
 cp /usr/bin/nodejs /usr/bin/node
130
 cp /usr/bin/nodejs /usr/bin/node
131
 /usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
131
 /usr/bin/curl -0 -L https://npmjs.org/install.sh | sh
132
+npm install -g npm@{NPM_VERSION}
132
 npm install -g n@${NODEJS_N_VERSION} --save
133
 npm install -g n@${NODEJS_N_VERSION} --save
133
 n ${NODEJS_VERSION}
134
 n ${NODEJS_VERSION}
134
-npm update -g npm@{NPM_VERSION}
135
+npm upgrade -g npm@{NPM_VERSION}
135
 npm install -g pug@2.0.0-beta6
136
 npm install -g pug@2.0.0-beta6
136
 npm install -g graceful-fs@4.1.10
137
 npm install -g graceful-fs@4.1.10
137
 npm install -g minimatch@3.0.3
138
 npm install -g minimatch@3.0.3