From 6d86da52d70f52fe51984127f6b605c4802f5a47 Mon Sep 17 00:00:00 2001
From: Sofus Rose <sofus@sofusrose.com>
Date: Tue, 15 Mar 2016 01:15:02 -0400
Subject: [PATCH] A file was deleted

---
 badpixels.txt | 21 ---------------------
 convmlv.sh    |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 badpixels.txt

diff --git a/badpixels.txt b/badpixels.txt
deleted file mode 100644
index 4545a62..0000000
--- a/badpixels.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# For 1080p Video on my Canon 7D Only, (as far as I know)
-# Remember, timestamp affects if it'll be applied!
-# Always use "dcraw -d -j -t 0" or "dcraw -v -d -j -t 0 -6 -T" when locating bad pixels!!
-
-# Format is: pixel column, pixel row, UNIX time of death
-
-# DOA - Discovered 3/14/16
-432 481 0
-197 1013 0
-167 677 0
-343 803 0
-183 142 0
-817 337 0
-1507 561 0
-1490 921 0
-1887 673 0
-284 149 0
-1023 320 0
-1059 1023 0
-1639 988 0
-322 953 0
diff --git a/convmlv.sh b/convmlv.sh
index d51bc31..b760fb6 100755
--- a/convmlv.sh
+++ b/convmlv.sh
@@ -392,7 +392,7 @@ for ARG in $*; do
 				mv "${TMP}/${bad_name}" "${TMP}/bp_gen"
 				cp $BADPIXEL_PATH "${TMP}/bp_imp"
 				
-				{ cat "${TMP}/bp_gen" && cat "${TMP}/bp_imp"; } > "${TMP}/${bad_name}" #Combine my file with the generated file.
+				{ cat "${TMP}/bp_gen" && cat "${TMP}/bp_imp"; } > "${TMP}/${bad_name}" #Combine specified file with the generated file.
 			else
 				cp $BADPIXEL_PATH "${TMP}/${bad_name}"
 			fi
@@ -517,8 +517,8 @@ for ARG in $*; do
 		
 		#Move tiffs into place.
 		trap "rm -rf ${FILE}; exit 1" INT
-		for tiff in $TMP/*.tiff; do		
-			mv $tiff $TIFF >/dev/null 2>/dev/null
+		for tiff in $TMP/*.tiff; do	
+			mv $tiff $TIFF >/dev/null 2>/dev/null #Gets mad if a LUT was applied, as all the tiffs are then deleted. Suppress and noone will know :).
 		done
 fi