various polishing

diff --git a/README b/README
index 7bde51abffca797fc4d6cf747cbb4150b56a503a..03e77b44d8008746922e168a5e3df5a6d9432b17 100644 (file)
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ under /git are links to the .git dirs of the respective repos under the
 hardcoded directory in setup.sh: gitroot=/a/bin/githtml. These
 directories are managed separately, mostly by rsyncing them.
 
 hardcoded directory in setup.sh: gitroot=/a/bin/githtml. These
 directories are managed separately, mostly by rsyncing them.
 

-Only the latest version of resume is kept in the resume branch which
+Only the latest version of resume is kept in the "r" branch which

 gets rebased on master.
 
 ./build.rb is not a generalized site generator, it has some content
 gets rebased on master.
 
 ./build.rb is not a generalized site generator, it has some content

diff --git a/_site/gitweb_home.html b/_site/gitweb_home.html
new file mode 100644 (file)
index 0000000..771af1c
--- /dev/null
+++ b/_site/gitweb_home.html
@@ -0,0 +1,5 @@
+<p>I actively maintain these projects. Please use them and <a href="/about-me.html">send me</a> feedback, patches, etc.</p>
+
+<p>Once a project has a few users, I also put it on my
+<a href="https://gitlab.com/users/iankelling/projects">gitlab.com account</a>
+</p>

diff --git a/about-me.html b/about-me.html
index 021bcf5645dedb62eef50c835ce406657f47310f..491e2f27aaeb6ee47d732a7fbcfdafbeefdd19f8 100644 (file)
--- a/about-me.html
+++ b/about-me.html
@@ -1,3 +1,4 @@
+<h4>Contact Info</h4>

 <ul>
     <li><a href="mailto:ian@iankelling.org">ian@iankelling.org</a></li>
     <li><a href="ian-kelling-pubkey.asc">gpg key: 0199 AD30 2539 BA2C D12E  ABF6 AACC C240 E969 C67B</a></li>
 <ul>
     <li><a href="mailto:ian@iankelling.org">ian@iankelling.org</a></li>
     <li><a href="ian-kelling-pubkey.asc">gpg key: 0199 AD30 2539 BA2C D12E  ABF6 AACC C240 E969 C67B</a></li>


@@ -5,6 +6,10 @@
     <li><a href="https://pump.iankelling.org/iank">iank@pump.iankelling.org</a>
     on <a href="https://pump.io">pump.io</a></li>
     <li><a href="https://mast.iankelling.org/@iank">iank@mast.iankelling.org</a> on <a href="https://mastodon.social/about">Mastodon</a></li>
     <li><a href="https://pump.iankelling.org/iank">iank@pump.iankelling.org</a>
     on <a href="https://pump.io">pump.io</a></li>
     <li><a href="https://mast.iankelling.org/@iank">iank@mast.iankelling.org</a> on <a href="https://mastodon.social/about">Mastodon</a></li>

+</ul>
+
+<h4>Other online activities</h4>
+<ul>

     <li><a href="https://ofswiki.org">ofswiki.org (wiki I run, mostly covering mediawiki admin)</a></li>
     <li><a href="https://github.com/ian-kelling/">GitHub profile</a></li>
     <li><a href="https://gitlab.com/iankelling">GitLab profile</a></li>
     <li><a href="https://ofswiki.org">ofswiki.org (wiki I run, mostly covering mediawiki admin)</a></li>
     <li><a href="https://github.com/ian-kelling/">GitHub profile</a></li>
     <li><a href="https://gitlab.com/iankelling">GitLab profile</a></li>

diff --git a/css/gitweb-site.scss b/css/gitweb-site.scss
index a8a7ba7ba759e39a5698862af430bcf13903bf83..d37a54812509411c30e609b9abc63cdf358ce762 100644 (file)
--- a/css/gitweb-site.scss
+++ b/css/gitweb-site.scss
@@ -11,7 +11,8 @@ body {
 }
 
 .page_header,
 }
 
 .page_header,

-.page_footer {
+.page_footer,
+.index_include {

   margin-bottom: 0;
   margin-left: auto;
   margin-right: auto;
   margin-bottom: 0;
   margin-left: auto;
   margin-right: auto;

diff --git a/gitweb-descriptions b/gitweb-descriptions
index cd6014b0e119bbb223506c997038d376af356393..b6fad5a6cf4e459481dd5cd004a4daf25b313d00 100755 (executable)
--- a/gitweb-descriptions
+++ b/gitweb-descriptions
@@ -34,6 +34,7 @@ gitroot=$1
 cd $gitroot
 
 shopt -s extglob
 cd $gitroot
 
 shopt -s extglob

+shopt -s nullglob

 
 _git_desc_readme() {
     while read -r line; do
 
 _git_desc_readme() {
     while read -r line; do


@@ -46,25 +47,13 @@ _git_desc_readme() {
     done < README*
 }
 
     done < README*
 }
 

-dirs=()
-for d in $gitroot/*; do
-    if [[ -d $d && ! -L $d ]]; then
-        for sub in $d/*; do
-            dirs+=($sub)
-        done
-    else
-        dirs+=($d)
-    fi
-done
-

 gitweb-descriptions() {
     for d in ${dirs[@]}; do
 gitweb-descriptions() {
     for d in ${dirs[@]}; do

-        d=$(readlink -f $d)
-        cd $d/..
-        e ${PWD##*/}
-        shopt -s nullglob
+        cd $(readlink -f $d)/..
+        if [[ ${personalized[${d##*/}]} ]]; then
+            echo "$pcategory" >.git/category
+        fi

         f=(!(LICENSE|COPYING|README|.git))
         f=(!(LICENSE|COPYING|README|.git))

-        shopt -u nullglob

         if [[ ${#f[@]} == 1 && ! -d $f ]]; then
             if [[ ! -x $f ]]; then
                 if [[ $f == *-function ]]; then
         if [[ ${#f[@]} == 1 && ! -d $f ]]; then
             if [[ ! -x $f ]]; then
                 if [[ $f == *-function ]]; then


@@ -80,4 +69,29 @@ gitweb-descriptions() {
         fi
     done
 }
         fi
     done
 }

+
+tmp=(
+    bashrc
+    automated-distro-installer
+    buildscripts
+    config-files
+    distro-setup
+    dot-emacs
+    fai-basefiles
+    ian-misc-bash
+    iankelling.org
+)
+declare -A personalized
+for p in ${tmp[@]}; do personalized[$p]=true; done
+pcategory="Personalized for my use. Useful as examples or to copy specific parts"
+
+
+dirs=()
+for d in $gitroot/*; do
+    if [[ ! -L $d ]]; then
+        continue
+    fi
+    dirs+=($d)
+done
+

 gitweb-descriptions "$@"
 gitweb-descriptions "$@"

diff --git a/setup.sh b/setup.sh
index 5aaf019c160b1f6d36124994d4a6c114fb949648..a68c4fc7e0a6ff9d10ba02e417a637cc0ff57d37 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -128,12 +128,14 @@ our \$site_footer = '$PWD/_site/gitweb-footer.html';
 push @stylesheets, "/css/gitweb-site.css";
 our \$favicon = '/assets/favicon.png';
 # default is 25, cuts off descriptions.
 push @stylesheets, "/css/gitweb-site.css";
 our \$favicon = '/assets/favicon.png';
 # default is 25, cuts off descriptions.

-our \$projects_list_description_width = 40;
+our \$projects_list_description_width = 50;

 # a bit superflous since they are all me
 our \$omit_owner = true;
 # highlight scripts with no extension, uses a patch
 # that is on it's way upstream.
 our \$highlight_force = 1;
 # a bit superflous since they are all me
 our \$omit_owner = true;
 # highlight scripts with no extension, uses a patch
 # that is on it's way upstream.
 our \$highlight_force = 1;

+our \$home_text = "$script_dir/_site/gitweb_home.html";
+our \$projects_list_group_categories = 1;

 EOF
 
 apache-site -p $port - $domain <<EOF
 EOF
 
 apache-site -p $port - $domain <<EOF