From c804262dc79d4cc0082b884fdc89746dbadee667 Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Thu, 21 Jan 2016 20:25:35 -0600
Subject: [PATCH] Consistent naming

Changed the names of some scripts
Updated the script contents to call the right files
---
 build-and-deploy-resume.sh                    |  4 +++
 build-and-deploy.sh                           |  8 ++---
 build-html-docker.sh                          | 34 +++++++++----------
 build-html-resume-docker.sh                   | 17 ++++++++++
 build-html-resume.sh                          |  8 +++++
 build-html.sh                                 | 16 ++++-----
 ...ild-pdf-resume-with-cover-letter-docker.sh |  0
 ...h => build-pdf-resume-with-cover-letter.sh |  2 +-
 8 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100755 build-and-deploy-resume.sh
 mode change 100755 => 100644 build-and-deploy.sh
 mode change 100755 => 100644 build-html-docker.sh
 create mode 100755 build-html-resume-docker.sh
 create mode 100755 build-html-resume.sh
 mode change 100755 => 100644 build-html.sh
 rename build-resume-with-cover-letter-pdf-docker.sh => build-pdf-resume-with-cover-letter-docker.sh (100%)
 rename build-resume-with-cover-letter-pdf.sh => build-pdf-resume-with-cover-letter.sh (76%)

diff --git a/build-and-deploy-resume.sh b/build-and-deploy-resume.sh
new file mode 100755
index 0000000..6300ce6
--- /dev/null
+++ b/build-and-deploy-resume.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+# Simple script to build he PDF, build the html, and deploy them to the gh-pages branch
+./build-pdf.sh && ./build-html.sh && ./package-and-deploy.sh
diff --git a/build-and-deploy.sh b/build-and-deploy.sh
old mode 100755
new mode 100644
index 6300ce6..1dc2dfc
--- a/build-and-deploy.sh
+++ b/build-and-deploy.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-
-# Simple script to build he PDF, build the html, and deploy them to the gh-pages branch
-./build-pdf.sh && ./build-html.sh && ./package-and-deploy.sh
+#!/usr/bin/env bash
+
+# Simple script to build he PDF, build the html, and deploy them to the gh-pages branch
+./build-pdf.sh && ./build-html.sh && ./package-and-deploy.sh
diff --git a/build-html-docker.sh b/build-html-docker.sh
old mode 100755
new mode 100644
index 877e852..b87793e
--- a/build-html-docker.sh
+++ b/build-html-docker.sh
@@ -1,17 +1,17 @@
-#!/usr/bin/env bash
-
-cd /source
-
-userid="$(cat userid.info)"
-
-# Script to build an HTML site from the PDF source
-pdf2htmlEX --zoom 1.5 --embed cfijo --dest-dir out DPSResume.pdf
-chown -R $userid:$userid out/
-chmod -R 666 out/
-chmod u+x out/
-mv out/DPSResume.html out/index.html
-
-tar -czvf ResumeSite.tar.gz -C out/ .
-chown $userid:$userid ResumeSite.tar.gz
-chmod 666 ResumeSite.tar.gz
-rm -rf out
+#!/usr/bin/env bash
+
+cd /source
+
+userid="$(cat userid.info)"
+
+# Script to build an HTML site from the PDF source
+pdf2htmlEX --zoom 1.5 --embed cfijo --dest-dir out DPSResume.pdf
+chown -R $userid:$userid out/
+chmod -R 666 out/
+chmod u+x out/
+mv out/DPSResume.html out/index.html
+
+tar -czvf ResumeSite.tar.gz -C out/ .
+chown $userid:$userid ResumeSite.tar.gz
+chmod 666 ResumeSite.tar.gz
+rm -rf out
diff --git a/build-html-resume-docker.sh b/build-html-resume-docker.sh
new file mode 100755
index 0000000..877e852
--- /dev/null
+++ b/build-html-resume-docker.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+cd /source
+
+userid="$(cat userid.info)"
+
+# Script to build an HTML site from the PDF source
+pdf2htmlEX --zoom 1.5 --embed cfijo --dest-dir out DPSResume.pdf
+chown -R $userid:$userid out/
+chmod -R 666 out/
+chmod u+x out/
+mv out/DPSResume.html out/index.html
+
+tar -czvf ResumeSite.tar.gz -C out/ .
+chown $userid:$userid ResumeSite.tar.gz
+chmod 666 ResumeSite.tar.gz
+rm -rf out
diff --git a/build-html-resume.sh b/build-html-resume.sh
new file mode 100755
index 0000000..980c15a
--- /dev/null
+++ b/build-html-resume.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo "$(id -u)" > userid.info
+
+# Script to build an HTML site from the PDF source
+docker run -v $(pwd):/source sothr/pdf2htmlex /usr/bin/env bash /source/build-html-resume-docker.sh
+
+rm userid.info
diff --git a/build-html.sh b/build-html.sh
old mode 100755
new mode 100644
index a00cb6e..236217e
--- a/build-html.sh
+++ b/build-html.sh
@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-
-echo "$(id -u)" > userid.info
-
-# Script to build an HTML site from the PDF source
-docker run -v $(pwd):/source sothr/pdf2htmlex /usr/bin/env bash /source/build-html-docker.sh
-
-rm userid.info
+#!/usr/bin/env bash
+
+echo "$(id -u)" > userid.info
+
+# Script to build an HTML site from the PDF source
+docker run -v $(pwd):/source sothr/pdf2htmlex /usr/bin/env bash /source/build-html-docker.sh
+
+rm userid.info
diff --git a/build-resume-with-cover-letter-pdf-docker.sh b/build-pdf-resume-with-cover-letter-docker.sh
similarity index 100%
rename from build-resume-with-cover-letter-pdf-docker.sh
rename to build-pdf-resume-with-cover-letter-docker.sh
diff --git a/build-resume-with-cover-letter-pdf.sh b/build-pdf-resume-with-cover-letter.sh
similarity index 76%
rename from build-resume-with-cover-letter-pdf.sh
rename to build-pdf-resume-with-cover-letter.sh
index 846bac5..86ad5d7 100755
--- a/build-resume-with-cover-letter-pdf.sh
+++ b/build-pdf-resume-with-cover-letter.sh
@@ -3,6 +3,6 @@
 echo "$(id -u)" > userid.info
 
 # Script to build a PDF from the latex source
-docker run -v $(pwd):/source schickling/latex /usr/bin/env bash /source/build-resume-with-cover-letter-pdf-docker.sh $1
+docker run -v $(pwd):/source schickling/latex /usr/bin/env bash /source/build-pdf-resume-with-cover-letter-docker.sh $1
 
 rm userid.info