difference between gitdir and githome

diff --git a/Makefile b/Makefile
index 31a35b5..5168253 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ gen/www/$(WEB_BASE_DIR)config.inc.php:
        @echo '$$githost = "${GIT_HOSTNAME}";' >> $@
        @echo '$$gitwebroot = "${WEB_BASE_DIR}";' >> $@
        @echo '$$gituser = "${GIT_USER}";' >> $@
+       @echo '$$githome = "${GIT_HOME}";' >> $@
        @echo '$$gitdir = "${GIT_HOME}/repos";' >> $@
        @echo '$$gitwebpath = "${GITWEB_DIR}";' >> $@
        @echo '?>' >> $@
@@ -56,7 +57,7 @@ gen/none.conf:
 gen/.website: gen/home gen/www/$(WEB_BASE_DIR) gen/sudoers.d gen/sudoers.d/git gen/www/$(WEB_BASE_DIR)config.inc.php gen/git-daemon.example gen/$(WEB_TYPE).conf
        @cp -r homegit/* gen/home/
        @cp -r src/* src/.??* gen/www/${WEB_BASE_DIR}
-       (cd git-master/gitweb && make prefix=/usr GITWEB_PROJECTROOT=${GIT_HOME} GITWEB_PROJECT_MAXDEPTH=50 GITWEB_EXPORT_OK=git-daemon-export-ok GITWEB_HOME_LINK_STR=/${WEB_BASE_DIR} GITWEB_SITENAME="${WEB_TITLE}" gitwebdir=${PREFIX}/${WEB_BASE_DIR}${GITWEB_DIR} all)
+       (cd git-master/gitweb && make prefix=/usr GITWEB_PROJECTROOT=${GIT_HOME}/repos GITWEB_PROJECT_MAXDEPTH=50 GITWEB_EXPORT_OK=git-daemon-export-ok GITWEB_HOME_LINK_STR=/${WEB_BASE_DIR} GITWEB_SITENAME="${WEB_TITLE}" gitwebdir=${PREFIX}/${WEB_BASE_DIR}${GITWEB_DIR} all)
        @for h in header footer indextext; do sed -r 's,__WEB_TITLE__,${WEB_TITLE},g; s,__PREFIX__,${PREFIX},g; s,__WEB_BASE_DIR__,${WEB_BASE_DIR},g; s,__GITWEB_DIR__,${GITWEB_DIR},g; s,__GIT_HOSTNAME__,${GIT_HOSTNAME},g; s,__GIT_HOSTPORT__,${GIT_HOSTPORT},g;' tpl/$$h.html > gen/$$h.html; done
        @touch $@
        @echo "Run 'make install' to install the git repositories and the web site"
@@ -66,7 +67,7 @@ clean:
        (cd git-master/gitweb && make clean)
 
 install: _root gen/.website _githome _webhome _sudo
-       (cd git-master/gitweb && make prefix=/usr GITWEB_PROJECTROOT=${GIT_HOME} GITWEB_PROJECT_MAXDEPTH=50 GITWEB_EXPORT_OK=git-daemon-export-ok GITWEB_HOME_LINK_STR=/${WEB_BASE_DIR} GITWEB_SITENAME="${WEB_TITLE}" gitwebdir=${PREFIX}/${WEB_BASE_DIR}${GITWEB_DIR} install)
+       (cd git-master/gitweb && make prefix=/usr GITWEB_PROJECTROOT=${GIT_HOME}/repos GITWEB_PROJECT_MAXDEPTH=50 GITWEB_EXPORT_OK=git-daemon-export-ok GITWEB_HOME_LINK_STR=/${WEB_BASE_DIR} GITWEB_SITENAME="${WEB_TITLE}" gitwebdir=${PREFIX}/${WEB_BASE_DIR}${GITWEB_DIR} install)
        @cp -v gen/*.html ${PREFIX}/${WEB_BASE_DIR}${GITWEB_DIR}/
        @echo ""
        @echo "Installation complete."

diff --git a/README.md b/README.md
index f19e0f7..c69e22f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Simple, easy web to install a git repositories 'server'.
 |:------- |:----------- |
 | Author  | Cyrille Pontvieux <jrd@enialis.net> |
 | Licence | GPL version 3 (or, at your option, any later version). See [LICENSE](LICENSE) for a full version and this [Quick guide](http://www.gnu.org/licenses/quick-guide-gplv3.html) to understand the licence |
-| Version | __1.0__ |
+| Version | __1.1__ |
 
 Difference with other solutions
 --------------------------------------

diff --git a/src/config.inc.php.example b/src/config.inc.php.example
index 989f4b5..bca179b 100644 (file)
--- a/src/config.inc.php.example
+++ b/src/config.inc.php.example
@@ -3,5 +3,6 @@ $title = 'git.myhost.com';
 $githost = 'myhost.com';
 $gitwebroot = '';
 $gituser = 'git';
+$githome = '/home/git';
 $gitdir = '/home/git/repos';
 $gitwebpath = 'gitweb';

diff --git a/src/include.inc.php b/src/include.inc.php
index 1b25dd5..5e5c08f 100644 (file)
--- a/src/include.inc.php
+++ b/src/include.inc.php
@@ -56,12 +56,12 @@ function purl($name) {
 }
 
 function gitrepoinfo($params) {
-  global $gituser, $gitdir;
+  global $gituser, $githome;
   $p = '';
   foreach (func_get_args() as $param) {
     $p .= ' ' . escapeshellarg($param);
   }
-  exec("sudo -u $gituser $gitdir/gitrepo.sh $p", $ret, $state);
+  exec("sudo -u $gituser $githome/gitrepo.sh $p", $ret, $state);
   if ($state == 0) {
     return $ret;
   } else {