directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r694199 - 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 wrapper/src/sh.script.in
Date Thu, 11 Sep 2008 09:59:10 GMT
Author: pamarcelot
Date: Thu Sep 11 02:59:09 2008
New Revision: 694199

URL: http://svn.apache.org/viewvc?rev=694199&view=rev
Log:
Fix for DIRSERVER-1249 (rc.d init script doesn't work for Mandriva Linux : location of "id"
binary).

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
    directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/src/sh.script.in

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=694199&r1=694198&r2=694199&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
Thu Sep 11 02:59:09 2008
@@ -310,9 +310,13 @@
             IDEXE="/usr/bin/id"
             if [ ! -x "$IDEXE" ]
             then
-                echo "Unable to locate 'id'."
-                echo "Please report this message along with the location of the command on
your system."
-                exit 1
+                IDEXE="/bin/id"
+                if [ ! -x "$IDEXE" ]
+                then
+                    echo "Unable to locate 'id'."
+                    echo "Please report this message along with the location of the command
on your system."
+                    exit 1
+                fi
             fi
         fi
 

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=694199&r1=694198&r2=694199&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
Thu Sep 11 02:59:09 2008
@@ -319,9 +319,13 @@
             IDEXE="/usr/bin/id"
             if [ ! -x "$IDEXE" ]
             then
-                echo "Unable to locate 'id'."
-                echo "Please report this message along with the location of the command on
your system."
-                exit 1
+                IDEXE="/bin/id"
+                if [ ! -x "$IDEXE" ]
+                then
+                    echo "Unable to locate 'id'."
+                    echo "Please report this message along with the location of the command
on your system."
+                    exit 1
+                fi
             fi
         fi
 

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=694199&r1=694198&r2=694199&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
Thu Sep 11 02:59:09 2008
@@ -248,9 +248,13 @@
             IDEXE="/usr/bin/id"
             if [ ! -x "$IDEXE" ]
             then
-                echo "Unable to locate 'id'."
-                echo "Please report this message along with the location of the command on
your system."
-                exit 1
+                IDEXE="/bin/id"
+                if [ ! -x "$IDEXE" ]
+                then
+                    echo "Unable to locate 'id'."
+                    echo "Please report this message along with the location of the command
on your system."
+                    exit 1
+                fi
             fi
         fi
 

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=694199&r1=694198&r2=694199&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
Thu Sep 11 02:59:09 2008
@@ -310,9 +310,13 @@
             IDEXE="/usr/bin/id"
             if [ ! -x "$IDEXE" ]
             then
-                echo "Unable to locate 'id'."
-                echo "Please report this message along with the location of the command on
your system."
-                exit 1
+                IDEXE="/bin/id"
+                if [ ! -x "$IDEXE" ]
+                then
+                    echo "Unable to locate 'id'."
+                    echo "Please report this message along with the location of the command
on your system."
+                    exit 1
+                fi
             fi
         fi
 

Modified: directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/src/sh.script.in
URL: http://svn.apache.org/viewvc/directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/src/sh.script.in?rev=694199&r1=694198&r2=694199&view=diff
==============================================================================
--- directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/src/sh.script.in
(original)
+++ directory/daemon/trunk/plugin/src/main/resources/org/apache/directory/daemon/installers/wrapper/src/sh.script.in
Thu Sep 11 02:59:09 2008
@@ -311,9 +311,13 @@
             IDEXE="/usr/bin/id"
             if [ ! -x "$IDEXE" ]
             then
-                echo "Unable to locate 'id'."
-                echo "Please report this message along with the location of the command on
your system."
-                exit 1
+                IDEXE="/bin/id"
+                if [ ! -x "$IDEXE" ]
+                then
+                    echo "Unable to locate 'id'."
+                    echo "Please report this message along with the location of the command
on your system."
+                    exit 1
+                fi
             fi
         fi
 



Mime
View raw message