Skip to contentSkip to conversation

gitweb: Do not automatically append " git" to custom site name

PATCH In review Petr Baudis 3 participants 4 messages Jun 15, 2016

lore
Share & tools
lore

Petr Baudis

author
#0 lore raw

PATCH 1/1 gitweb: Do not automatically append " git" to custom site name

If you customized the site name, you probably do not want the " git" appended so that the page title is not bastardized; I want repo.or.cz pages titled "Public Git Hosting", not "Public Git Hosting git" (what's hosting what?).

This slightly changes the $site_name semantics but only very insignificantly.

Signed-off-by Petr Baudis <[email protected]>

---

 gitweb/gitweb.perl |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
gitweb/gitweb.perl +3 -3
index c2dfdab..d165fdc 100755
@@ -39,7 +39,7 @@ our $home_link_str = "++GITWEB_HOME_LINK
 
 # name of your site or organization to appear in page titles
 # replace this with something more descriptive for clearer bookmarks
-our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
+our $site_name = "++GITWEB_SITENAME++" || "$ENV{'SERVER_NAME'} Git" || "Untitled Git";
 
 # filename of html text to include at top of each page
 our $site_header = "++GITWEB_SITE_HEADER++";

@@ -1455,7 +1455,7 @@ sub git_header_html {
 	my $status = shift || "200 OK";
 	my $expires = shift;
 
-	my $title = "$site_name git";
+	my $title = "$site_name";
 	if (defined $project) {
 		$title .= " - $project";
 		if (defined $action) {

@@ -3842,7 +3842,7 @@ sub git_opml {
 <?xml version="1.0" encoding="utf-8"?>
 <opml version="1.0">
 <head>
-  <title>$site_name Git OPML Export</title>
+  <title>$site_name OPML Export</title>
 </head>
 <body>
 <outline text="git RSS feeds">
#1 lore raw
Quoted 1 line · Petr Baudis

+our $site_name = "++GITWEB_SITENAME++" || "$ENV{'SERVER_NAME'} Git" || "Untitled Git";

This will never show "Untitled" (instead it shows " Git") and will cause a perl warning if $ENV{SERVER_NAME} is not defined and warnings are enabled (which tye are in gitweb).

I think this is what you want:

our $site_name = "++GITWEB_SITENAME++" ||

                 ($ENV{SERVER_NAME} || "Untitled") . " Git";

-Peff

author
#2 lore raw

PATCH 1/1 gitweb: Do not automatically append " git" to custom site name

If you customized the site name, you probably do not want the " git" appended so that the page title is not bastardized; I want repo.or.cz pages titled "Public Git Hosting", not "Public Git Hosting git" (what's hosting what?).

This slightly changes the $site_name semantics but only very insignificantly.

Signed-off-by Petr Baudis <[email protected]>

---

 gitweb/gitweb.perl |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
gitweb/gitweb.perl +4 -3
index e77fc11..1e80f43 100755
@@ -39,7 +39,8 @@ our $home_link_str = "++GITWEB_HOME_LINK
 
 # name of your site or organization to appear in page titles
 # replace this with something more descriptive for clearer bookmarks
-our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled";
+our $site_name = "++GITWEB_SITENAME++"
+                 || ($ENV{'SERVER_NAME'} || "Untitled") . " Git";
 
 # filename of html text to include at top of each page
 our $site_header = "++GITWEB_SITE_HEADER++";

@@ -1433,7 +1434,7 @@ sub git_header_html {
 	my $status = shift || "200 OK";
 	my $expires = shift;
 
-	my $title = "$site_name git";
+	my $title = "$site_name";
 	if (defined $project) {
 		$title .= " - $project";
 		if (defined $action) {

@@ -3847,7 +3848,7 @@ sub git_opml {
 <?xml version="1.0" encoding="utf-8"?>
 <opml version="1.0">
 <head>
-  <title>$site_name Git OPML Export</title>
+  <title>$site_name OPML Export</title>
 </head>
 <body>
 <outline text="git RSS feeds">
#3 lore raw
In reply to Petr Baudis
Quoted 1 line · Petr Baudis

+our $site_name = "++GITWEB_SITENAME++" || "$ENV{'SERVER_NAME'} Git" || "Untitled Git";

I'd use perhaps "[$ENV{'SERVER_NAME'}] Git".

Signature · 3 lines
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git