Explorar o código

Try to fix double slash on snap #962

Lauri Ojansivu %!s(int64=7) %!d(string=hai) anos
pai
achega
428465d361
Modificáronse 1 ficheiros con 5 adicións e 7 borrados
  1. 5 7
      snapcraft.yaml

+ 5 - 7
snapcraft.yaml

@@ -72,7 +72,6 @@ parts:
         plugin: nodejs
         node-engine: 4.8.7
         node-packages:
-            - n
             - npm@4.6.1
             - node-gyp
             - node-pre-gyp
@@ -88,8 +87,6 @@ parts:
         prepare: |
             echo "Cleaning environment first"
             rm -rf ~/.meteor ~/.npm /usr/local/lib/node_modules
-            echo "Installing node"
-            n 4.8.7
             echo "Applying paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303"
             paxctl -mC `which node`
             echo "Installing meteor"
@@ -98,11 +95,11 @@ parts:
             chmod +x install_meteor.sh
             sh install_meteor.sh
             rm install_meteor.sh
-            mkdir -p ~/.meteor/packages
-            cd ~/.meteor/packages
+            mkdir packages
+            cd packages
             git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
             git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-            sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/.meteor/packages/meteor-useraccounts-core/package.js
+            sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
             cd ..
         build: |
             rm -rf package-lock.json .build
@@ -113,9 +110,10 @@ parts:
             sed -i "s|build\/Release\/bson|browser_build\/bson|g" .build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js
             cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
             rm -rf node_modules/bcrypt
-            npm install bcrypt
+            meteor npm install --save bcrypt
             cd ../../../../
             npm install
+            meteor npm install --save bcrypt
         install: |
             cp -r .build/bundle/* $SNAPCRAFT_PART_INSTALL/
             cp .build/bundle/.node_version.txt $SNAPCRAFT_PART_INSTALL/