Merge branch 'lukeshu/fix-bitrot'

2 files changed, 21 insertions, 1 deletions

diff --git a/bin/gitify b/bin/gitify
index 2c73bcd..1e5d43d 100755
--- a/bin/gitify
+++ b/bin/gitify
@@ -74,10 +74,26 @@ main() {
 				waurl="http://web.archive.org/web/$(murl2url "${listingdir##*/content-dir/}/")"
 				msg="$waurl"
 			fi
-			gitdate="$(sed -r 's/(....)(..)(..)(..)(..)(..)/\1-\2-\3T\4:\5:\6/' <<<"$time")"
+
+			HACK_TZ=-0500
+			if [[ "$branch" == BETA/CVTUTF-1-4 || "$branch" == ALPHA/CVTUTF-1-5-draft ]]; then
+				HACK_TZ=-0400
+			fi
+			HACK_NAME='Luke Shumaker'
+			HACK_EMAIL='lukeshu@lukeshu.com'
+
+			gitdate="$(sed -r 's/(....)(..)(..)(..)(..)(..)/\1-\2-\3T\4:\5:\6 '"$HACK_TZ"'/' <<<"$time")"
+
 			git add .
+
 			export GIT_AUTHOR_DATE=$gitdate
+			export GIT_AUTHOR_NAME=$HACK_NAME
+			export GIT_AUTHOR_EMAIL=$HACK_EMAIL
+
 			export GIT_COMMITTER_DATE=$gitdate
+			export GIT_COMMITTER_NAME=$HACK_NAME
+			export GIT_COMMITTER_EMAIL=$HACK_EMAIL
+
 			git commit --allow-empty -m "$msg"
 			if [[ "$branch" != *.OLD ]]; then
 				lastbranch="$branch"
diff --git a/bin/poolify b/bin/poolify
index 6f9a109..e256157 100755
--- a/bin/poolify
+++ b/bin/poolify
@@ -71,6 +71,10 @@ main() {
 
 	echo '# Pass 2'
 	while read -r time url; do
+		if [[ "$url" == */2.0-Update/* ]]; then
+			# Gross hack
+			continue
+		fi
 		name="${url##*/Public/}"
 		dirpart="${name%/*}"
 		filepart="${name##*/}"