From b7cd73e1d6d5b82ad2f87c1ad90ed0b3080da2ac Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 12 Dec 2007 09:30:35 +0000 Subject: [PATCH] Updated build process git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8092 594d385d-05f5-0310-b6e9-bd551577e9d8 --- contrib/fix_config.sh | 30 ------------------------- contrib/scripts/{start-gosa.sh => gosa} | 0 debian/gosa.postinst | 3 +++ debian/rules | 7 ++++++ 4 files changed, 10 insertions(+), 30 deletions(-) delete mode 100755 contrib/fix_config.sh rename contrib/scripts/{start-gosa.sh => gosa} (100%) diff --git a/contrib/fix_config.sh b/contrib/fix_config.sh deleted file mode 100755 index b17fd7ab5..000000000 --- a/contrib/fix_config.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -CONF=/etc/gosa/gosa.conf -cat << EOF - -This script will take your current $CONF and will update the menu and tab tags. It -will not touch the parts you have touched between the main tabs. A backup copy is -created. - -EOF -read -n1 -sp "Do you want to continue? (y/n)" answer -echo - -if [ "$answer" != "y" -a "$answer" != "Y" ]; then - echo "Aborted." - echo - exit 1 -fi - -if [ ! -f $CONF ]; then - echo "Can't find $CONF Aborted." - echo - exit 1 -fi - -cp $CONF $CONF.orig - -sed '/
/d;/<\/conf>/d' gosa.conf > $CONF -sed -n '/
/p' $CONF.orig >> $CONF -echo '' >> $CONF diff --git a/contrib/scripts/start-gosa.sh b/contrib/scripts/gosa similarity index 100% rename from contrib/scripts/start-gosa.sh rename to contrib/scripts/gosa diff --git a/debian/gosa.postinst b/debian/gosa.postinst index 0c45ec06a..bcf54d1e7 100755 --- a/debian/gosa.postinst +++ b/debian/gosa.postinst @@ -49,6 +49,9 @@ for source in /usr/bin/convert /usr/bin/lpstat; do fi done +# Update gosa +/usr/sbin/update-gosa + # Finally restart servers for server in $servers; do if [ -x /usr/sbin/invoke-rc.d ]; then diff --git a/debian/rules b/debian/rules index b095ca434..e1699bea6 100755 --- a/debian/rules +++ b/debian/rules @@ -77,6 +77,8 @@ install-stamp: # Install binaries -mv debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/bin + -mkdir debian/gosa/usr/sbin + -mv debian/gosa/usr/share/gosa/update-gosa debian/gosa/usr/sbin # Install documentation -for lang in en de fr nl; do mkdir -p debian/gosa-help-$$lang/usr/share/gosa/doc/guide/user/$$lang; done @@ -108,6 +110,11 @@ install-stamp: rm -rf debian/gosa/usr/share/gosa/include/smarty; \ sed -i "s%require(\"smarty/Smarty.class.php\");%require(\"$SMARTY_LOCATION/Smarty.class.php\");%g" debian/gosa/usr/share/gosa/include/php_setup.inc + # Configure update location + sed -i 's%include/class_location.inc%/etc/gosa/classes%g' debian/gosa/usr/sbin/update-gosa + sed -i 's%$class_mapping= get_classes();%$class_mapping= get_classes("/usr/share/gosa");%g' debian/gosa/usr/sbin/update-gosa + sed -i 's%class_location.inc%/etc/gosa/classes%g' debian/gosa/usr/share/gosa/include/functions.inc + # Fix permissions -find debian/gosa -type f -exec chmod -x {} \; &> /dev/null -find debian/smarty-render -type f -exec chmod -x {} \; &> /dev/null -- 2.30.2