Browse Source

Update build scripts to install npm from NodeSource, and meteor with npm.

Thanks to Meteor developers!
Lauri Ojansivu 3 years ago
parent
commit
c062621dd5
2 changed files with 12 additions and 11 deletions
  1. 2 2
      rebuild-wekan.bat
  2. 10 9
      rebuild-wekan.sh

+ 2 - 2
rebuild-wekan.bat

@@ -16,7 +16,7 @@ cd C:\repos
 REM Install chocolatey
 @"%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET "PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
 
-choco install -y git curl python2 dotnet4.5.2 nano mongodb-3 mongoclient meteor
+choco install -y git curl python2 dotnet4.5.2 nano mongodb-4 mongoclient
 
 curl -O https://nodejs.org/dist/v12.22.6/node-v12.22.6-x64.msi
 call node-v12.22.6-x64.msi
@@ -25,12 +25,12 @@ call npm config -g set msvs_version 2015
 call meteor npm config -g set msvs_version 2015
 
 call npm -g install npm
+call npm -g install meteor
 call npm -g install node-gyp
 call npm -g install fibers
 cd C:\repos
 git clone https://github.com/wekan/wekan.git
 cd wekan
-git checkout edge
 echo "Building Wekan."
 REM del /S /F /Q packages
 REM ## REPOS BELOW ARE INCLUDED TO WEKAN

+ 10 - 9
rebuild-wekan.sh

@@ -22,18 +22,18 @@ do
 		if [[ "$OSTYPE" == "linux-gnu" ]]; then
 	                echo "Linux";
 			# Debian, Ubuntu, Mint
-			sudo apt-get install -y build-essential gcc g++ make git curl wget npm p7zip-full
+			sudo apt-get install -y build-essential gcc g++ make git curl wget p7zip-full zip unzip unp
+      curl -fsSL https://deb.nodesource.com/setup_12.x | sudo -E bash -
+      sudo apt-get install -y nodejs
 			# npm nodejs
 			#sudo npm -g install npm
 			#curl -0 -L https://npmjs.org/install.sh | sudo sh
 			#sudo chown -R $(id -u):$(id -g) $HOME/.npm
-			sudo npm -g install n
-			sudo n 12.22.6
-			#curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
-			#sudo apt-get install -y nodejs
+			#sudo npm -g install n
+			#sudo n 12.22.6
 		elif [[ "$OSTYPE" == "darwin"* ]]; then
 		        echo "macOS";
-			pause '1) Install XCode 2) Install Node 8.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'
+			pause '1) Install XCode 2) Install Node 12.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'
 		elif [[ "$OSTYPE" == "cygwin" ]]; then
 		        # POSIX compatibility layer and Linux environment emulation for Windows
 		        echo "TODO: Add Cygwin";
@@ -55,14 +55,15 @@ do
 			exit;
 		fi
 
-		## Latest npm with Meteor 1.8.x
+		## Latest npm with Meteor 2.2
 		sudo npm -g install npm
 		sudo npm -g install node-gyp
-		# Latest fibers for Meteor 1.8.x
+		# Latest fibers for Meteor 2.2
 		sudo mkdir -p /usr/local/lib/node_modules/fibers/.node-gyp
 		sudo npm -g install fibers
 		# Install Meteor, if it's not yet installed
-		curl https://install.meteor.com | bash
+    sudo npm install -g meteor --unsafe-perm
+		#curl https://install.meteor.com | bash
 		#sudo chown -R $(id -u):$(id -g) $HOME/.npm $HOME/.meteor
 		break
 		;;