diff -Buw ../pebuilder314-beta/plugin/unixutils/autorun_modifypath_unixutils.cmd unixutils/autorun_modifypath_unixutils.cmd
--- ../pebuilder314-beta/plugin/unixutils/autorun_modifypath_unixutils.cmd 2003-10-15 21:16:04.000000000 -0700
+++ unixutils/autorun_modifypath_unixutils.cmd 2005-07-12 20:39:13.187500000 -0700
@@ -1,15 +1,6 @@
-@Echo off
-Title=[ UnixUtils ] Modify Path
-::
-:: Modify the path
-::
-if exist %systemdrive%\programs\pathman\pathman.exe %systemdrive%\programs\pathman\pathman.exe /as %systemdrive%\programs\unixutils
-::
-:: if you cant find pathman.exe - complain
-::
-if not exist %systemdrive%\programs\pathman\pathman.exe Title=[ UnixUtils ] Error Modifying path
-if not exist %systemdrive%\programs\pathman\pathman.exe Echo ------------------------------------------------
-if not exist %systemdrive%\programs\pathman\pathman.exe Echo Unable to find [ %systemdrive%\pathman\pathman.exe ]
-if not exist %systemdrive%\programs\pathman\pathman.exe Echo ------------------------------------------------
-if not exist %systemdrive%\programs\pathman\pathman.exe pause
-exit
\ No newline at end of file
+@if "%debug%" == "" echo off
+@if not "%debug%" == "" echo on
+:: $Id$
+:: in case PESetEnv.exe is disabled
+call %SystemRoot%\SYSTEM32\addpath.cmd %SystemDrive%\Programs\unixutils
+exit 0
Only in unixutils: files
diff -Buw ../pebuilder314-beta/plugin/unixutils/unixutils.htm unixutils/unixutils.htm
--- ../pebuilder314-beta/plugin/unixutils/unixutils.htm 2003-10-25 16:22:04.000000000 -0700
+++ unixutils/unixutils.htm 2005-07-12 20:34:18.375000000 -0700
@@ -1,9 +1,14 @@
-
+
+
+
+Native Win32 Unix Utilities [Patched]
+
+
PE Builder v3 plugin
-
-UnixUtils
+
+Native Win32 Unix Utilities [Patched]
Ports of common GNU utilities to native Win32. In this context, native means the executables do only depend on the Microsoft C-runtime (msvcrt.dll) and not an emulation layer like that provided by Cygwin tools.
@@ -11,15 +16,13 @@
This pebuilder plugin requires:
1) UnixUtils from
http://unxutils.sourceforge.net/
-
-unzip all the files to
-the "\unixutils\files" directory:
-
-
-
+
+Unzip all the files to the plugin\unixutils\files directory.
-
-
+
+
+Requires PESetEnv plugin.
+
PE Builder
Copyright (c) 2002-2003 Bart Lagerweij. All rights reserved.
diff -Buw ../pebuilder314-beta/plugin/unixutils/unixutils.inf unixutils/unixutils.inf
--- ../pebuilder314-beta/plugin/unixutils/unixutils.inf 2003-10-25 16:26:50.000000000 -0700
+++ unixutils/unixutils.inf 2005-07-13 09:13:17.875000000 -0700
@@ -1,4 +1,7 @@
-; unixutils.inf
+; $Id$
+; Modified by Ross Smith (http://smithii.com/)
+; Requires the PESetEnv plugin to correctly set the master PATH environment variable -Ross
+; Include files whose names are the same as Windows commands (e.g., expand, find, install, sort) -Ross
; PE Builder v3 plug-in INF file for WinSCP
; unixutils homepage: http://unxutils.sourceforge.net/
; Created by Jeff Black
@@ -9,141 +11,28 @@
Signature= "$Windows NT$"
[PEBuilder]
-Name="Unix Utilities for Win32"
-Enable=1
+Name="Unix Utilities for Win32 (Requires PESetEnv Plugin) [smithii.com patch]"
+Enable=0
Help="unixutils.htm"
-;[WinntDirectories]
-;a="Programs\unixutils",2
-;
-; It is easiest to copy these to the %systemroot%\system32\ directory
-; if you add these to a different directory then you would need
-; to modify the path.
-;
+[Update]
+id=unixutils
+depends=pesetenv
+url=http://smithii.com/files/plugins/
+Version=$Revision$
+
+[WinntDirectories]
+a="Programs\unixutils",2
[SourceDisksFiles]
-files\agrep.exe=2
-files\ansi2knr.exe=2
-files\basename.exe=2
-files\bc.exe=2
-files\bison.exe=2
-files\bunzip2.exe=2
-files\bzip2.exe=2
-files\bzip2recover.exe=2
-files\cat.exe=2
-files\chgrp.exe=2
-files\chmod.exe=2
-files\chown.exe=2
-files\cksum.exe=2
-files\cmp.exe=2
-files\comm.exe=2
-files\compress.exe=2
-files\cp.exe=2
-files\csplit.exe=2
-files\cut.exe=2
-files\date.exe=2
-files\dc.exe=2
-files\dd.exe=2
-files\df.exe=2
-files\diff.exe=2
-files\diff3.exe=2
-files\dircolors.exe=2
-files\dirname.exe=2
-files\du.exe=2
-files\echo.exe=2
-files\egrep.exe=2
-files\env.exe=2
-;files\expand.exe=2
-files\expr.exe=2
-files\factor.exe=2
-files\fgrep.exe=2
-;files\find.exe=2
-files\flex.exe=2
-files\fmt.exe=2
-files\fold.exe=2
-files\fsplit.exe=2
-files\gawk.exe=2
-files\gclip.exe=2
-files\gplay.exe=2
-files\grep.exe=2
-files\gsar.exe=2
-files\gunzip.exe=2
-files\gzip.exe=2
-files\head.exe=2
-files\id.exe=2
-files\indent.exe=2
-;files\install.exe=2
-files\join.exe=2
-files\jwhois.exe=2
-files\less.exe=2
-files\lesskey.exe=2
-files\libfl.a=2
-files\libfl.lib=2
-files\ln.exe=2
-files\logname.exe=2
-files\ls.exe=2
-files\m4.exe=2
-files\make.exe=2
-files\makedepend.exe=2
-files\makemsg.exe=2
-files\man.exe=2
-files\md5sum.exe=2
-files\mkdir.exe=2
-files\mkfifo.exe=2
-files\mknod.exe=2
-files\mv.exe=2
-files\mvdir.exe=2
-files\nl.exe=2
-files\od.exe=2
-files\paste.exe=2
-files\patch.exe=2
-files\pathchk.exe=2
-files\pclip.exe=2
-files\pr.exe=2
-files\printenv.exe=2
-files\printf.exe=2
-files\pwd.exe=2
-files\recode.exe=2
-files\rm.exe=2
-files\rman.exe=2
-files\rmdir.exe=2
-files\sdiff.exe=2
-files\sed.exe=2
-files\seq.exe=2
-files\shar.exe=2
-files\sleep.exe=2
-;files\sort.exe=2
-files\split.exe=2
-files\stego.exe=2
-files\su.exe=2
-files\sum.exe=2
-files\sync.exe=2
-files\tac.exe=2
-files\tail.exe=2
-files\tar.exe=2
-files\tee.exe=2
-files\test.exe=2
-files\touch.exe=2
-files\tr.exe=2
-files\type.exe=2
-files\uname.exe=2
-files\unexpand.exe=2
-files\uniq.exe=2
-files\unrar.exe=2
-files\unshar.exe=2
-files\unzip.exe=2
-files\uudecode.exe=2
-files\uuencode.exe=2
-files\wc.exe=2
-files\wget.exe=2
-files\wget.hlp=2
-files\which.exe=2
-files\whoami.exe=2
-files\xargs.exe=2
-files\yes.exe=2
-files\zcat.exe=2
-files\zip.exe=2
;autorun_modifypath_unixutils.cmd=2
+[SourceDisksFolders]
+files=a
+
[Append]
nu2menu.xml, unixutils_nu2menu.xml
+
+[Software.AddReg]
+; Added to master environment by PESetEnv plugin
+0x1,"PESetEnv\Path\Postfix","500_unixutils","%SystemDrive%\Programs\unixutils"