From aa28007c8aa0d16e994f2c4f80e879aeaed5eeee Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Wed, 26 Aug 2015 18:56:07 -0400
Subject: [PATCH] scripts

---
 .gitignore | 1 +
 deploy.sh  | 8 --------
 dmaPush.sh | 4 ++++
 modPush.sh | 4 ++++
 4 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100755 deploy.sh
 create mode 100755 dmaPush.sh
 create mode 100755 modPush.sh

diff --git a/.gitignore b/.gitignore
index 9f353a7c..2d5f27c1 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 c937f814..00000000
--- 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 00000000..68db3183
--- /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 00000000..a0049398
--- /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
-- 
GitLab