From 7ce2104b616272600f192f54976762e11edf36a0 Mon Sep 17 00:00:00 2001 From: breel Date: Fri, 28 Aug 2020 16:29:12 -0600 Subject: [PATCH] New deploy --- deploy.sh | 7 ++++++- public/vue/dndex-ui | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/deploy.sh b/deploy.sh index 3191f02..4b67fcd 100644 --- a/deploy.sh +++ b/deploy.sh @@ -8,7 +8,6 @@ function main() { go test ./... fi GOOS=linux GOARCH=arm GOARM=5 gobuild $exec - scp -r ./public/swagger/* zach@tickle.lan:./dndex1/files/swagger/ scp $exec zach@tickle.lan:./dndex1/dndex.new ssh zach@tickle.lan bash -c "true; while [ -e ./dndex1/dndex.new ]; do printf '.'; sleep 3; done; echo" if [ -n "$BIG" ]; then @@ -17,6 +16,9 @@ function main() { echo ssh bel@remote.blapointe.com bash -c 'true; md5sum ./services/bin/dndex*; while [ -e ./services/bin/dndex.new ]; do printf "."; sleep 3; done; md5sum ./services/bin/dndex*' big fi + ssh zach@tickle.lan bash -c "true; rm -rf ./dndex1/files/swagger/" + scp -r ./public/swagger/ zach@tickle.lan:./dndex1/files/swagger/ + ssh zach@tickle.lan bash -c "true; cd ./dndex1/public; rm -rf ./swagger; ln -s ../files/swagger" rm $exec } @@ -42,7 +44,10 @@ function big() { npm install npm run build ssh zach@tickle.lan rm -rf ./dndex-ui/public + ssh zach@tickle.lan bash -c "true; rm -rf ./dndex-ui/public" scp -r ./dist zach@tickle.lan:./dndex-ui/public + ssh zach@tickle.lan bash -c "true; rm -rf ./dndex1/public" + scp -r ./dist zach@tickle.lan:./dndex1/public popd } diff --git a/public/vue/dndex-ui b/public/vue/dndex-ui index 72595fa..cf63a21 160000 --- a/public/vue/dndex-ui +++ b/public/vue/dndex-ui @@ -1 +1 @@ -Subproject commit 72595fae58fc45b991227d47adb87121619ff3be +Subproject commit cf63a2104bf16cd986ddf1fc3578ed013a43f20e