summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Short <tshort.rlists@gmail.com>2017-04-02 17:01:09 -0400
committerTom Short <tshort.rlists@gmail.com>2017-04-02 17:01:09 -0400
commit000f42799b396cbd09a80ca433e9348e1cb778c3 (patch)
treec9fc8a9dc0f831b6178e70a4819b76e757d80132
parentd2f1057e0999334bfe3806274d87dd560e0bf3e0 (diff)
Another patch attempt
-rw-r--r--create-models.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/create-models.sh b/create-models.sh
index da1e00c..7a6eab4 100644
--- a/create-models.sh
+++ b/create-models.sh
@@ -6,7 +6,7 @@ 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
+patch -p1 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
@@ -14,7 +14,8 @@ 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 checkout src/dactyl_keyboard/dactyl.clj
+
# git add things/*-4x5.stl
# git add things/right-4x5-plate.dxf