←︎ stagit :: cb8344b

commit cb8344bae6df17d2a767996a795d421e7690af02

Author: acidvegas <acid.vegas@acid.vegas>

Date:   Sat May 2 01:10:32 2020 -0400

    Fixed nullbyte errors and added footers

---

 README.md | 10 +++++-----

 stagit    | 25 +++++++++++++++++++------

 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md

index f607129..9d5a98f 100644

--- a/README.md

+++ b/README.md

@@ -27,11 +27,11 @@ The `CNAME` option is optional if you are planning on using a custom domain with

 Lastly, stagit will ignore the `$REPO_DIR/mirrors` directory by default. To make stagit include this directory, remove `-path $REPO_DIR/mirrors -prune` from the `find` command in the source.

 ## Todo

-- Add a footer to all pages with the last updated datetime and a link to this repository.

-- Hook git pushes to rebuild the repositories index.

-- Add support for displaying LICENSE/README files and convert markdown to HTML.

-- Add support to view file contents *(have to detect all non-binary files to exclude images, etc)*.

-- Fix all possible bashisms identified in source by checkbashisms.

+- Support for using hosting on Gitlab.

+- Git push hook.

+- Support for displaying LICENSE/README files and convert markdown to HTML. *(`find . -type f -not -path '*/\.git/*' -exec grep -I -q . {} \; -print`)*

+- Support to view files and content.

+- Fix bashisms identified by checkbashisms.

 ## Mirrors

 - [acid.vegas](https://acid.vegas/stagit) *(main)*

diff --git a/stagit b/stagit

index 54b7c2c..f882935 100755

--- a/stagit

+++ b/stagit

@@ -46,6 +46,8 @@ generate_css() {

 		echo ".item td{white-space:nowrap}"

 		echo ".linenumber{text-align:right;-moz-user-select:-moz-none;-khtml-user-select: none;-webkit-user-select:none}"

 		echo ".linenumber a{text-decoration:none}"

+		echo "#footer{border-top:1px dashed #fff;color:#444;font-size:smaller;margin-top:10px;padding-top:5px;width:100%}"

+		echo "#footer a{color:#aaa;text-decoration:none}"

 		echo "#main{border-collapse:collapse;table-layout:fixed}"

 		echo "#main td,th{padding-left:5px;padding-right:5px}"

 		echo "#navigation{color:#fff;font-weight:900;text-align:left}"

@@ -98,6 +100,11 @@ generate_commit_index() {

 	} > $WWW_DIR/$REPO_NAME/commit/$COMMIT_HASH.html

 }

+generate_footer() {

+	local DATE=$(date +"%m/%d/%y")

+	echo "<div id=\"footer\">site generated by <a href=\"https://github.com/acidvegas/stagit\" target=\"_blank\">stagit</a> on <a href=\"#\">$DATE</a></div>" >> $1

+}

+

 [ ! -d $REPO_DIR ] && echo "'$REPO_DIR' directory does not exist" && exit 1

 REPOS=$(find $REPO_DIR -type d -name mirrors -prune -o -type d -name .git -print | sort  -t '/' -k 7)

 [ -z "$REPOS" ] && echo "'$REPO_DIR' contains no repositories" && exit 1

@@ -116,7 +123,7 @@ for d in $REPOS; do

 		echo "missing description file for $REPO_NAME ($d/description)"

 		REPO_DESC="no description available"

 	fi

-	REPO_OWNER=$(git --git-dir $d log --reverse --pretty=format:'%an' | head -n 1) # todo: find a better way to do this & handle organization name parsing

+	REPO_OWNER=$(git --git-dir $d log --reverse --pretty=format:'%an' | head -n 1)

 	REPO_LAST_COMMIT=$(git --git-dir $d log -1 --pretty=format:'%cs')

 	echo "<tr class=\"item\"><td><a href=\"$REPO_NAME\" title=\"$REPO_NAME\">$REPO_NAME</a></td><td>$REPO_DESC</td><td>$REPO_OWNER</td><td>$REPO_LAST_COMMIT</td></tr>" >> $WWW_DIR/index.html

 	if [ $CLONE_URL = 'remote' ]; then

@@ -155,7 +162,7 @@ for d in $REPOS; do

 		COMMIT_DELETIONS=$(echo $COMMIT_SUMMARY | cut -d'|' -f3)

 		echo "<tr class=\"item\"><td>$COMMIT_SIGNED</td><td><a href=\"commit/$COMMIT_HASH.html\" title=\"View this commit\">$COMMIT_HASH</a></td><td>$COMMIT_MESSAGE</td><td>$COMMIT_AUTHOR</td><td>$COMMIT_DATE</td><td align=\"right\">$COMMIT_FILES</td><td align=\"right\">$COMMIT_INSERTIONS</td><td align=\"right\">$COMMIT_DELETIONS</td></tr>" >> $WWW_DIR/$REPO_NAME/index.html

 		generate_commit_index $REPO_NAME $COMMIT_HASH

 		if [ $MAX_COMMIT_LINES -ne 0 -a $(echo "$COMMIT_DIFF" | wc -l) -gt $MAX_COMMIT_LINES ]; then

 			COMMIT_DIFF=$(echo "$COMMIT_DIFF" | head -n $MAX_COMMIT_LINES)

 		fi

@@ -163,10 +170,16 @@ for d in $REPOS; do

 		COMMIT_DIFF=$(echo "$COMMIT_DIFF" | sed 's/\[31m/<span class="deletion">/g; s/\[1\;31m/<span class="remote">/g; s/\[32m/<span class="insertion">/g; s/\[1\;32m/<span class="branch">/g; s/\[33m/<span class="commit">/g; s/\[36m/<span class="hunk">/g; s/\[1\;36m/<span class="reference">/g; s/\[1m/<span class="bold">/g; s/\[m/<\/span>/g')

 		COUNT=1

 		echo "$COMMIT_DIFF" | while IFS= read -r line; do

-				echo "<tr class=\"item\"><td class=\"linenumber\"><a href=\"#l$COUNT\" name=\"l$COUNT\">$COUNT</a></td><td><pre>$line</pre></td></tr>" >> $WWW_DIR/$REPO_NAME/commit/$COMMIT_HASH.html

-				COUNT=`expr $COUNT + 1`

-			fi

+			echo "<tr class=\"item\"><td class=\"linenumber\"><a href=\"#l$COUNT\" name=\"l$COUNT\">$COUNT</a></td><td><pre>$line</pre></td></tr>" >> $WWW_DIR/$REPO_NAME/commit/$COMMIT_HASH.html

+			COUNT=`expr $COUNT + 1`

+			#fi

 		done

+		echo "</table>" >> $WWW_DIR/$REPO_NAME/commit/$COMMIT_HASH.html

+		generate_footer $WWW_DIR/$REPO_NAME/commit/$COMMIT_HASH.html

 	done

+	echo "</table>" >> $WWW_DIR/$REPO_NAME/index.html

+	generate_footer $WWW_DIR/$REPO_NAME/index.html

 done

+echo "</table>" >> $WWW_DIR/index.html

+generate_footer $WWW_DIR/index.html