[vhffs-dev] [594] Added vhffs-compat to default install.

[subversion@xxxxxxxxx]

Revision: 594
Author:   beuss
Date:     2007-05-02 06:18:49 +0000 (Wed, 02 May 2007)

Log Message:
-----------
Added vhffs-compat to default install.
Added fix-home-perms.sh to installed files.
Bash path is no more hardcoded.

Modified Paths:
--------------
    trunk/Makefile.am
    trunk/configure.ac
    trunk/vhffs-compat/Makefile.am
    trunk/vhffs-compat/fix-home-perms.sh
    trunk/vhffs-compat/svn-link-4.0.sh


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2007-05-01 18:08:27 UTC (rev 593)
+++ trunk/Makefile.am	2007-05-02 06:18:49 UTC (rev 594)
@@ -2,10 +2,10 @@
 
 SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
 
-SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-intl vhffs-jabber vhffs-listengine \
+SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
 	vhffs-panel vhffs-robots vhffs-shells vhffs-tests vhffs-tools
 
-EXTRA_DIST = vhffs-compat vhffs-forum vhffs-irc vhffs-packages \
+EXTRA_DIST = vhffs-forum vhffs-irc vhffs-packages \
 	vhffs-rfc vhffs-tests
 
 help:

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-05-01 18:08:27 UTC (rev 593)
+++ trunk/configure.ac	2007-05-02 06:18:49 UTC (rev 594)
@@ -12,6 +12,11 @@
 	AC_MSG_ERROR([perl is needed to run $PACKAGE_NAME])
 fi
 
+AC_PATH_PROG([BASH], [bash], [not found])
+if test "$PERL" = 'not found'; then
+    AC_MSG_ERROR([bash is needed to run $PACKAGE_NAME])
+fi
+
 AM_INIT_AUTOMAKE([no-define no-define dist-bzip2])
 
 

Modified: trunk/vhffs-compat/Makefile.am
===================================================================
--- trunk/vhffs-compat/Makefile.am	2007-05-01 18:08:27 UTC (rev 593)
+++ trunk/vhffs-compat/Makefile.am	2007-05-02 06:18:49 UTC (rev 594)
@@ -5,7 +5,8 @@
 
 compat_SCRIPTS = \
 	updatedb.pl \
-	svn-link-4.0.sh
+	svn-link-4.0.sh \
+	fix-home-perms.sh
 
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
@@ -13,7 +14,8 @@
 	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g' \
 	-e 's,'%VHFFS_BACKEND_DIR%',$(BACKENDDIR),g' \
 	-e 's,'%VHFFS_COMPAT_DIR%',$(compatdir),g' \
-	-e 's,'%VHFFS_BOTS_DIR%',$(BOTSDIR),g'
+	-e 's,'%VHFFS_BOTS_DIR%',$(BOTSDIR),g' \
+	-e 's,'%BASH%',$(BASH),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-compat/fix-home-perms.sh
===================================================================
--- trunk/vhffs-compat/fix-home-perms.sh	2007-05-01 18:08:27 UTC (rev 593)
+++ trunk/vhffs-compat/fix-home-perms.sh	2007-05-02 06:18:49 UTC (rev 594)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!%BASH%
 function help()
 {
     echo "Usage: $0 /path/to/homes/base [--perform]" >&2

Modified: trunk/vhffs-compat/svn-link-4.0.sh
===================================================================
--- trunk/vhffs-compat/svn-link-4.0.sh	2007-05-01 18:08:27 UTC (rev 593)
+++ trunk/vhffs-compat/svn-link-4.0.sh	2007-05-02 06:18:49 UTC (rev 594)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!%BASH%
 
 REPOROOT=$1
 SCRIPTPATH=$2