Merge branch 'master' of ssh://cpp/liblerdorf

Makefile

@@ -16,7 +16,9 @@ install:
 	$(MAKEDIR) -p $(DEST)
 	$(COPY) -r ACU/ $(DEST)
 	! test -d $(GITOLITE_DEST) || $(MAKEDIR) -p $(GITOLITE_DEST)/update.secondary.d
-	! test -d $(GITOLITE_DEST) || $(COPY) hooks/* $(GITOLITE_DEST)/update.secondary.d/
+	! test -d $(GITOLITE_DEST) || $(COPY) hooks/gl-pre-git $(GITOLITE_DEST)/
+	! test -d $(GITOLITE_DEST) || $(COPY) hooks/subjects.pl $(GITOLITE_DEST)/update.secondary.d/
+	! test -d $(GITOLITE_DEST) || $(COPY) hooks/submissions.pl $(GITOLITE_DEST)/update.secondary.d/
 
 update:
 	$(GIT) pull
@@ -26,6 +28,7 @@ upgrade: install
 
 unstall:
 	$(RM) -r $(DEST)/ACU/
+	! test -d $(GITOLITE_DEST) || $(RM) -rf $(GITOLITE_DEST)/gl-pre-git
 	! test -d $(GITOLITE_DEST) || $(RM) -rf $(GITOLITE_DEST)/update.secondary.d
 	! test -d $(GITOLITE_DEST) || $(MAKEDIR) -p $(GITOLITE_DEST)/update.secondary.d
 

commands/first-install.sh

@@ -23,6 +23,11 @@ then
 	fi
     done
 
+    if ! getent passwd | grep "intradmin:" > /dev/null 2> /dev/null
+    then
+	pw useradd intradmin -u 942 -d /data -s /bin/false
+    fi
+
 elif [ "$KERNEL" = "Linux" ]
 then
 

hooks/gl-pre-git

@@ -11,6 +11,8 @@ $ACU::Log::log_file = "/var/log/hooks/" . basename($0) . ".log";
 
 my $ip = $1 if ($ENV{'SSH_CLIENT'} =~ m/([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}).*/);
 
+exit 0 if (!$ip);
+
 log DEBUG, "Connection to $ENV{GL_REPO} from $ip";
 
 # First, check if the repository is in the YYYY/ directory

hooks/subjects.pl

@@ -602,7 +602,7 @@ sub tag_tests
  	$rendu = $_[2];
     }
     else {
-	$rendu = "*";
+	$rendu = "";
     }
 
     my $year;

process/view_log.sh

@@ -19,8 +19,6 @@ else
     CMD="tail -n 50"
 fi
 
-TMP=`mktemp`
-
 DIRS="./"
 if [ -d "/var/log/hooks/" ]
 then
@@ -40,9 +38,14 @@ then
 
 else
 
-    LIST=`mktemp`
+    if [ `uname -s` = "FreeBSD" ]
+    then
+	LIST=`mktemp lerdorf_log_XXXXX`
+    else
+	LIST=`mktemp`
+    fi
 
-    find $DIRS -name '*.log' > $LIST
+    find $DIRS -name '*.log' > "$LIST"
 
     while [ $# -gt 0 ]
     do