directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r782546 - in /directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers: bin/apacheds-init deb/apacheds-init macosxpkg/apacheds.init solarispkg/apacheds-init
Date Mon, 08 Jun 2009 07:08:48 GMT
Author: pamarcelot
Date: Mon Jun  8 07:08:48 2009
New Revision: 782546

URL: http://svn.apache.org/viewvc?rev=782546&view=rev
Log:
Fix for DIRSERVER-1365 (Modification on the current init script (at least version 1.5.4) placed
under /etc/init.d). Applied patch from Alex Alvarez.

Modified:
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.init
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init?rev=782546&r1=782545&r2=782546&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/bin/apacheds-init
Mon Jun  8 07:08:48 2009
@@ -67,15 +67,17 @@
 #-----------------------------------------------------------------------------
 
 # Get the fully qualified path to the script
-case $0 in
-    /*)
-        SCRIPT="$0"
-        ;;
-    *)
-        PWD=`pwd`
-        SCRIPT="$PWD/$0"
-        ;;
-esac
+case $0 in 
+    /*) 
+        SCRIPT="$0" 
+        ;; 
+   ./*) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*\.\///'`" 
+        ;; 
+     *) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*//'`" 
+        ;; 
+esac 
 
 # Resolve the true real path without any sym links.
 CHANGED=true

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init?rev=782546&r1=782545&r2=782546&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
Mon Jun  8 07:08:48 2009
@@ -76,15 +76,17 @@
 #-----------------------------------------------------------------------------
 
 # Get the fully qualified path to the script
-case $0 in
-    /*)
-        SCRIPT="$0"
-        ;;
-    *)
-        PWD=`pwd`
-        SCRIPT="$PWD/$0"
-        ;;
-esac
+case $0 in 
+    /*) 
+        SCRIPT="$0" 
+        ;; 
+   ./*) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*\.\///'`" 
+        ;; 
+     *) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*//'`" 
+        ;; 
+esac 
 
 # Resolve the true real path without any sym links.
 CHANGED=true

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.init
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.init?rev=782546&r1=782545&r2=782546&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.init
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/macosxpkg/apacheds.init
Mon Jun  8 07:08:48 2009
@@ -63,15 +63,17 @@
 #-----------------------------------------------------------------------------
 
 # Get the fully qualified path to the script
-case $0 in
-    /*)
-        SCRIPT="$0"
-        ;;
-    *)
-        PWD=`pwd`
-        SCRIPT="$PWD/$0"
-        ;;
-esac
+case $0 in 
+    /*) 
+        SCRIPT="$0" 
+        ;; 
+   ./*) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*\.\///'`" 
+        ;; 
+     *) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*//'`" 
+        ;; 
+esac 
 
 # Resolve the true real path without any sym links.
 CHANGED=true

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init?rev=782546&r1=782545&r2=782546&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/solarispkg/apacheds-init
Mon Jun  8 07:08:48 2009
@@ -67,15 +67,17 @@
 #-----------------------------------------------------------------------------
 
 # Get the fully qualified path to the script
-case $0 in
-    /*)
-        SCRIPT="$0"
-        ;;
-    *)
-        PWD=`pwd`
-        SCRIPT="$PWD/$0"
-        ;;
-esac
+case $0 in 
+    /*) 
+        SCRIPT="$0" 
+        ;; 
+   ./*) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*\.\///'`" 
+        ;; 
+     *) 
+        SCRIPT="`pwd`/`echo $0 | sed -e 's/^[ ]*//'`" 
+        ;; 
+esac 
 
 # Resolve the true real path without any sym links.
 CHANGED=true



Mime
View raw message