[Fusionforge-commits] r11274 - in trunk/src: deb-specific debian/dsf-in plugins/scmsvn plugins/scmsvn/bin plugins/scmsvn/packaging/install

Christian Bayle cbayle at libremir.placard.fr.eu.org
Sat Oct 30 12:41:14 CEST 2010


Author: cbayle
Date: 2010-10-30 12:41:14 +0200 (Sat, 30 Oct 2010)
New Revision: 11274

Added:
   trunk/src/plugins/scmsvn/bin/
   trunk/src/plugins/scmsvn/bin/install.sh
Removed:
   trunk/src/deb-specific/install-svn.sh
Modified:
   trunk/src/debian/dsf-in/plugin-scmsvn.postinst
   trunk/src/plugins/scmsvn/packaging/install/plugin-scmsvn
Log:
Make svn plugin behave like the others


Deleted: trunk/src/deb-specific/install-svn.sh
===================================================================
--- trunk/src/deb-specific/install-svn.sh	2010-10-29 22:16:00 UTC (rev 11273)
+++ trunk/src/deb-specific/install-svn.sh	2010-10-30 10:41:14 UTC (rev 11274)
@@ -1,34 +0,0 @@
-#! /bin/sh
-# 
-# Configure Subversion for Sourceforge
-# Roland Mas, Gforge
-
-
-
-set -e
-
-if [ $(id -u) != 0 ] ; then
-    echo "You must be root to run this, please enter passwd"
-    exec su -c "$0 $1"
-fi
-
-gforge_chroot=$(grep ^gforge_chroot= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
-
-case "$1" in
-    configure)
-        echo "Modifying inetd for Subversion server"
-        # First, dedupe the commented lines
-        update-inetd --remove  "svnserve stream tcp nowait.400 gforge_scm /usr/bin/svnserve svnserve -i -r $gforge_chroot" || true
-        update-inetd --remove  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $gforge_chroot" || true
-        update-inetd --add  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $gforge_chroot"
-	;;
-
-    purge)
-        update-inetd --remove  "svnserve stream tcp nowait.400 gforge_scm /usr/bin/svnserve svnserve -i -r $gforge_chroot"
-        update-inetd --remove  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $gforge_chroot"
-	;;
-
-    *)
-	echo "Usage: $0 {configure|purge}"
-	exit 1
-esac

Modified: trunk/src/debian/dsf-in/plugin-scmsvn.postinst
===================================================================
--- trunk/src/debian/dsf-in/plugin-scmsvn.postinst	2010-10-29 22:16:00 UTC (rev 11273)
+++ trunk/src/debian/dsf-in/plugin-scmsvn.postinst	2010-10-30 10:41:14 UTC (rev 11274)
@@ -40,7 +40,7 @@
 		fi
 	fi
 	# Setup inetd
-	/usr/share/@OLDPACKAGE@/plugins/scmsvn/bin/install-svn.sh configure
+	/usr/share/@OLDPACKAGE@/plugins/scmsvn/bin/install.sh configure
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

Copied: trunk/src/plugins/scmsvn/bin/install.sh (from rev 11273, trunk/src/deb-specific/install-svn.sh)
===================================================================
--- trunk/src/plugins/scmsvn/bin/install.sh	                        (rev 0)
+++ trunk/src/plugins/scmsvn/bin/install.sh	2010-10-30 10:41:14 UTC (rev 11274)
@@ -0,0 +1,34 @@
+#! /bin/sh
+# 
+# Configure Subversion for Sourceforge
+# Roland Mas, Gforge
+
+
+
+set -e
+
+if [ $(id -u) != 0 ] ; then
+    echo "You must be root to run this, please enter passwd"
+    exec su -c "$0 $1"
+fi
+
+gforge_chroot=$(grep ^gforge_chroot= /etc/fusionforge/fusionforge.conf | cut -d= -f2-)
+
+case "$1" in
+    configure)
+        echo "Modifying inetd for Subversion server"
+        # First, dedupe the commented lines
+        update-inetd --remove  "svnserve stream tcp nowait.400 gforge_scm /usr/bin/svnserve svnserve -i -r $gforge_chroot" || true
+        update-inetd --remove  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $gforge_chroot" || true
+        update-inetd --add  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $gforge_chroot"
+	;;
+
+    purge)
+        update-inetd --remove  "svnserve stream tcp nowait.400 gforge_scm /usr/bin/svnserve svnserve -i -r $gforge_chroot"
+        update-inetd --remove  "svn stream tcp nowait.400 scm-gforge /usr/bin/svnserve svnserve -i -r $gforge_chroot"
+	;;
+
+    *)
+	echo "Usage: $0 {configure|purge}"
+	exit 1
+esac

Modified: trunk/src/plugins/scmsvn/packaging/install/plugin-scmsvn
===================================================================
--- trunk/src/plugins/scmsvn/packaging/install/plugin-scmsvn	2010-10-29 22:16:00 UTC (rev 11273)
+++ trunk/src/plugins/scmsvn/packaging/install/plugin-scmsvn	2010-10-30 10:41:14 UTC (rev 11274)
@@ -1,4 +1,4 @@
-deb-specific/install-svn.sh         usr/share/gforge/plugins/scmsvn/bin/
-plugins/scmsvn/common/*             usr/share/gforge/plugins/scmsvn/common/
-plugins/scmsvn/etc/plugins/scmsvn/* etc/gforge/plugins/scmsvn/
+plugins/scmsvn/bin/*                usr/share/@OLDPACKAGE@/plugins/scmsvn/bin/
+plugins/scmsvn/common/*             usr/share/@OLDPACKAGE@/plugins/scmsvn/common/
+plugins/scmsvn/etc/plugins/scmsvn/* etc/@OLDPACKAGE@/plugins/scmsvn/
 plugins/scmsvn/etc/*.ini 	    etc/@PACKAGE@/config.ini.d/




More information about the Fusionforge-commits mailing list