nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-23 12:31:06 -05:00
Code

fix npm install from build scripts

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-04 20:24:46 -04:00
parent f43e954a31
commit 379d1b60bd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Admin/build.ps1
View File

@ -1,3 +1,4 @@
$curDir = pwd
$dir = Split-Path -Parent $MyInvocation.MyCommand.Path $dir = Split-Path -Parent $MyInvocation.MyCommand.Path
echo "`n## Building Admin" echo "`n## Building Admin"
@ -9,7 +10,9 @@ dotnet restore $dir\Admin.csproj
echo "Clean" echo "Clean"
dotnet clean $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish dotnet clean $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish
echo "Node Build" echo "Node Build"
npm --prefix $dir install $dir cd $dir
npm install
cd $curDir
gulp --gulpfile $dir\gulpfile.js build gulp --gulpfile $dir\gulpfile.js build
echo "Publish" echo "Publish"
dotnet publish $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish dotnet publish $dir\Admin.csproj -c "Release" -o $dir\obj\Azure\publish

5
src/Admin/build.sh
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
CUR_DIR="$(pwd)"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo -e "\n## Building Admin" echo -e "\n## Building Admin"
@ -12,7 +13,9 @@ dotnet restore $DIR/Admin.csproj
echo "Clean" echo "Clean"
dotnet clean $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish dotnet clean $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish
echo "Node Build" echo "Node Build"
npm --prefix $DIR install $DIR cd $DIR
npm install
cd $CUR_DIR
gulp --gulpfile $DIR/gulpfile.js build gulp --gulpfile $DIR/gulpfile.js build
echo "Publish" echo "Publish"
dotnet publish $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish dotnet publish $DIR/Admin.csproj -c "Release" -o $DIR/obj/Docker/publish