summaryrefslogtreecommitdiff
path: root/create-models.sh
diff options
context:
space:
mode:
Diffstat (limited to 'create-models.sh')
-rw-r--r--create-models.sh22
1 files changed, 11 insertions, 11 deletions
diff --git a/create-models.sh b/create-models.sh
index 0c911fa..da1e00c 100644
--- a/create-models.sh
+++ b/create-models.sh
@@ -5,18 +5,18 @@ cp things/right-plate.scad things/right-4x5-plate.scad
openscad -o things/right-4x5.stl things/right-4x5.scad >/dev/null 2>&1 &
openscad -o things/left-4x5.stl things/left-4x5.scad >/dev/null 2>&1 &
openscad -o things/right-4x5-plate.dxf things/right-4x5-plate.scad >/dev/null 2>&1 &
+
+git am < 0001-Changes-for-5x6.patch
+lein run src/dactyl_keyboard/dactyl.clj
+cp things/right.scad things/right-5x6.scad
+cp things/left.scad things/left-5x6.scad
+cp things/right-plate.scad things/right-5x6-plate.scad
+openscad -o things/right-5x6.stl things/right-5x6.scad >/dev/null 2>&1 &
+openscad -o things/left-5x6.stl things/left-5x6.scad >/dev/null 2>&1 &
+openscad -o things/right-5x6-plate.dxf things/right-5x6-plate.scad >/dev/null 2>&1 &
+git apply -R < 0001-Changes-for-5x6.patch
+
# git add things/*-4x5.stl
# git add things/right-4x5-plate.dxf
# git commit -m "Add CAD files"
-
-# git checkout 5x6
-# lein run src/dactyl_keyboard/dactyl.clj
-# cp things/right.scad things/right-5x6.scad
-# cp things/left.scad things/left-5x6.scad
-# cp things/right-plate.scad things/right-5x6-plate.scad
-# openscad -o things/right-5x6.stl things/right-5x6.scad &
-# openscad -o things/left-5x6.stl things/left-5x6.scad &
-# openscad -o things/right-5x6-plate.dxf things/right-5x6-plate.scad &
-# git checkout mine/master
-
wait \ No newline at end of file