From 11fbbbb475590dfe1c8c6dd004203843f977acb9 Mon Sep 17 00:00:00 2001
From: Sofus Rose <sofus@sofusrose.com>
Date: Fri, 9 Dec 2016 00:36:50 -0500
Subject: [PATCH] Added cleanDocs, added package signing to mkrelease.sh,
 edited readme. Updated alpha version.

---
 CHANGELOG         |  5 +++++
 README.md         |  4 ++--
 convmlv.sh        |  2 +-
 docs/cleanDocs.sh | 12 ++++++++++++
 mkrelease.sh      | 21 ++++++++++++++++++++-
 5 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100755 docs/cleanDocs.sh

diff --git a/CHANGELOG b/CHANGELOG
index 1d50d2f..a33483c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 [code]
 
+[b]v2.0.1[/b]: I'm back! Did some quick fixes. Also, there is now a bundled tarball available - no need to mess around with manual dependencies yourself anymore.
+[size=8pt]*Updated PDF with all new features. Nothing is unexplained, now![/size]
+[size=8pt]*Added some Mac compatibility.[/size]
+[size=8pt]*DNG sequences now use symlinks instead of copying.[/size]
+[size=8pt]*Fixed DNG sequence bug.[/size]
 
 [b]v2.0.0[/b]: I think convmlv is the stablest it's ever been! Though I'm sure there's plenty more bugs to discover :).
 [size=8pt]*Color Management: Real, 3D LUT-based gamma/gamut choices! See -g/-G. There is now minimal quality loss from sensor to image. Adds a dependency: color-core. [/size]
diff --git a/README.md b/README.md
index 41a9fec..a7ecd14 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # convmlv #
 
-RAW ML Formats to Workable Images/Movies Developer
+RAW Formats (Magic Lantern) to Images/Movies Developer
 =======
 I needed a workflow to provide me full control over development for filmmaking with Magic Lantern (beyond mlrawviewer's excellent preview!), while keeping things simple by providing defaults for everything.
 
@@ -39,6 +39,6 @@ Especially the PDF is designed as a tutorial; take a look!
 ## Development
 To build the PDF and MANPAGE using LATEX, run `docs/buildDocs.sh`. You can clean it up using `docs/cleanDocs.sh`.
 
-To make a release tarball, simply place all the manual binary deps into the `binaries` dir and run `./mkrelease.sh`.
+To make a release tarball, simply place all the manual binary deps into the `binaries` dir and run `./mkrelease.sh`. Optionally, you can call `./mkrelease bare` to make a release without included examples.
 
 The source code is located in `src`, where you'll find bash and Python code, as well as the builtin plugins. convmlv.sh itself imports all the src's, and acts as a kind of program selector; develop is but one option.
diff --git a/convmlv.sh b/convmlv.sh
index d21ac59..efdbc9d 100755
--- a/convmlv.sh
+++ b/convmlv.sh
@@ -24,7 +24,7 @@
 #~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #~ SOFTWARE.
 
-VERSION="2.1.0a2" #Version string.
+VERSION="2.1.0a3" #Version string.
 INPUT_ARGS=$(echo "$@") #The original input argument string.
 
 if [ $# == 0 ]; then #No given arguments.
diff --git a/docs/cleanDocs.sh b/docs/cleanDocs.sh
new file mode 100755
index 0000000..a483a29
--- /dev/null
+++ b/docs/cleanDocs.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+#Run from within docs/.
+
+ROOT_DIR="/home/sofus/subhome/src/convmlv"
+DDIR="$ROOT_DIR/docs"
+
+#~ rm -f ./docs.aux ./docs.log ./docs.out ./docs.toc ./texput.log > /dev/null #Remove any local bullshit.
+
+cd $DDIR
+
+rm -f $DDIR/docs.aux $DDIR/docs.log $DDIR/docs.out $DDIR/docs.toc $DDIR/texput.log $DDIR/MANPAGE $DDIR/docs.pdf > /dev/null
diff --git a/mkrelease.sh b/mkrelease.sh
index 912e42a..9060988 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -1,10 +1,14 @@
 #!/bin/bash
 
 VERSION=$(echo "$(./convmlv.sh -v)" | sed -e 's/\./\_/g')
+TYPE=$1
+
+if [[ -z "${TYPE// }" ]]; then TYPE="examples"; fi
 
 #HOW TO USE (Linux and Mac):
 #  1. Make sure everything is up to date.
 #  2. Put mlv2badpixels.sh, mlv_dump, raw2dng, and cr2hdr into the "binaries" folder in the repository.
+#  4. Run the script with "bare" or "examples" as argument. "examples" is default.
 #  3. A release tarball will automatically be created in "release" in the repository.
 
 ## It's reccommended that BINPATH is a folder in REP_PATH.
@@ -25,10 +29,25 @@ else
 	echo "Platform not yet supported! Contact me at contact@sofusrose.com."
 fi
 
+TARBALL="$RELEASE/convmlv-${VERSION}-${PLATFORM}.tar.gz"
+
 $DOCPATH/cleanDocs.sh > /dev/null
 $DOCPATH/buildDocs.sh > /dev/null
 
 cd $REP_PATH
-tar -czvf $RELEASE/convmlv-${VERSION}-${PLATFORM}.tar.gz binaries/ src/ CHANGELOG licence convmlv.sh color-core/ color-ext DEPENDENCIES docs/MANPAGE docs/docs.pdf docs/workflow.txt configs/*
+case $TYPE in
+	examples)
+		tar -czvf "$TARBALL" binaries/ src/ CHANGELOG 7D_badpixels.txt licence convmlv.sh \
+			color-core/ color-ext docs/MANPAGE docs/docs.pdf docs/workflow.txt configs/*
+		;;
+	bare)
+		tar -czvf "$TARBALL" binaries/ src/ CHANGELOG licence convmlv.sh \
+                        color-core/ color-ext docs/MANPAGE docs/docs.pdf
+		;;
+esac
+
+gpg -b "$TARBALL"
 
 $DOCPATH/cleanDocs.sh > /dev/null
+
+gpg --verify "${TARBALL}.sig" "$TARBALL"