factor out gitweb-descriptions

[iankelling.org] / setup.sh

diff --git a/setup.sh b/setup.sh
index 66953c5b38da72a0605117976f1456b3eb0be21b..deb61b9c26e6e3bf0613e0fcc791fbf805b00cf6 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -72,16 +72,15 @@ our @extra_breadcrumbs = (
 );
 our \$home_link_str = 'git';
 our \$site_footer = '$PWD/_site/gitweb-footer.html';
-push @stylesheets, "/gitweb-site.css";
-push @stylesheets, "/common.css";
+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 = 40;
 # a bit superflous since they are all me
-our $omit_owner = true;
+our \$omit_owner = true;
 # highlight scripts with no extension, uses a patch
 # that is on it's way upstream.
-our $highlight_force = 1;
+our \$highlight_force = 1;
 EOF
 
 apache-site - $domain <<EOF
@@ -146,43 +145,8 @@ Alias /git /usr/share/gitweb
 EOF
 
 
-# my projects all have README or --help with a short single line
-# description which I parse and put into the gitweb description.
-_git_desc_readme() {
-    while read -r line; do
-        [[ $line ]] || continue
-        if echo "$line" | grep "^ *[#*]" &>/dev/null; then
-            continue
-        fi
-        echo "$line" > .git/description
-        break
-    done < README*
-}
-gitweb_descriptions() {
-    for d in $gitroot/*; do
-        d=$(readlink -f $d)
-        cd $d/..
-        e ${PWD##*/}
-        shopt -s nullglob
-        f=(!(LICENSE|COPYING|README|.git))
-        shopt -u nullglob
-        if [[ ${#f[@]} == 1 && ! -d $f ]]; then
-            if [[ ! -x $f ]]; then
-                if [[ $f == *-function ]]; then
-                    ${f%-function} --help | sed -n '2p' > .git/description
-                else
-                    _git_desc_readme
-                fi
-            else
-                $f --help | sed -n '2p' > .git/description
-            fi
-        else
-            _git_desc_readme
-        fi
-    done
-}
-
-gitweb_descriptions
+
+$script_dir/gitweb-descriptions $gitroot
 
 $script_dir/build.rb
 s lnf -T $script_dir/_site /var/www/$domain/html