Rolled back patch for --current that created more problems.

2 files changed, 6 insertions, 12 deletions

diff --git a/makeself-header.sh b/makeself-header.sh
index 477f7be..0c22b9f 100755
--- a/makeself-header.sh
+++ b/makeself-header.sh
@@ -32,9 +32,6 @@ MS_Printf()
 MS_Progress()
 {
     while read a; do
-        if test x"\$ownership" = xy; then
-            chown \$idu "\$a" ; chgrp \$idg "\$a" ;
-        fi
 	MS_Printf .
     done
 }
@@ -339,15 +336,13 @@ if test "\$keep" = n; then
     trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf \$tmpdir; eval \$finish; exit 15' 1 2 3 15
 fi
 
-if test x"\$ownership" = xy; then
-    PATH=/usr/xpg4/bin:\$PATH;
-    idu=\`id -u\`;
-    idg=\`id -g\`;
-fi
-
 for s in \$filesizes
 do
-    if ! MS_dd "\$0" \$offset \$s | eval "$GUNZIP_CMD" | ( cd "\$tmpdir"; UnTAR x ) | MS_Progress; then
+    if MS_dd "\$0" \$offset \$s | eval "$GUNZIP_CMD" | ( cd "\$tmpdir"; UnTAR x ) | MS_Progress; then
+		if test x"\$ownership" = xy; then
+			(PATH=/usr/xpg4/bin:\$PATH; cd "\$tmpdir"; chown -R \`id -u\` .;  chgrp -R \`id -g\` .)
+		fi
+    else
 		echo
 		echo "Unable to decompress \$0" >&2
 		eval \$finish; exit 1
diff --git a/makeself.sh b/makeself.sh
index 96ee0eb..878bb49 100755
--- a/makeself.sh
+++ b/makeself.sh
@@ -3,7 +3,7 @@
 # Makeself version 2.1.x
 #  by Stephane Peter <megastep@megastep.org>
 #
-# $Id: makeself.sh,v 1.58 2006-04-19 22:18:46 megastep Exp $
+# $Id: makeself.sh,v 1.59 2006-04-20 19:20:54 megastep Exp $
 #
 # Utility to create self-extracting tar.gz archives.
 # The resulting archive is a file holding the tar.gz archive with
@@ -59,7 +59,6 @@
 #           Better handling of dot files in the archive directory.
 # - 2.1.5 : Made the md5sum detection consistent with the header code.
 #           Check for the presence of the archive directory
-#           Avoid problems when changing the ownership of extracted files.
 #
 # (C) 1998-2005 by Stéphane Peter <megastep@megastep.org>
 #