diff --git a/.gitignore b/.gitignore index 9f353a7c8f8b22e53bdac429b74182356669c853..2d5f27c1862c6ad0cd07cfe1c227d68aa4eb3f2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.idea/ *.DS_Store node/node_modules/ +.push.sh \ No newline at end of file diff --git a/deploy.sh b/deploy.sh deleted file mode 100755 index c937f8140d4c1645722561defb70581fe1c29144..0000000000000000000000000000000000000000 --- a/deploy.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -rsync -r -v --exclude=".*" --exclude='node/node_modules/' ~/Research/WebApps/DMDesign/DMDesign ~/Projects/dma/Web/mod - -cd ~/Projects/dma -hg addremove . -hg ci -m "deploy from script" -hg push \ No newline at end of file diff --git a/dmaPush.sh b/dmaPush.sh new file mode 100755 index 0000000000000000000000000000000000000000..68db3183dcf9aceaaadbefaa158b208baa8a1c67 --- /dev/null +++ b/dmaPush.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd ~/Research/CBAStuff/git/archives/dma +git subtree pull -P Web/dmdesign fabpeople:people/amanda.ghassaei/dmdesign master --squash diff --git a/modPush.sh b/modPush.sh new file mode 100755 index 0000000000000000000000000000000000000000..a004939860f1be6192133dc34d357626278683d5 --- /dev/null +++ b/modPush.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +cd ~/Research/CBAStuff/git/archives/dma +git subtree pull -P Web/mod/dmdesign fabpeople:people/amanda.ghassaei/dmdesign master --squash