Patch and diff - Revision history

Andypflueger at 17:51, 12 September 2009

2009-09-12T17:51:37Z

Andypflueger at 17:45, 12 September 2009

2009-09-12T17:45:42Z

Andypflueger at 16:31, 12 September 2009

2009-09-12T16:31:42Z

Cpg at 01:11, 11 September 2009

2009-09-11T01:11:45Z

Cpg at 01:10, 11 September 2009

2009-09-11T01:10:51Z

Cpg at 01:05, 11 September 2009

2009-09-11T01:05:36Z

Cpg at 01:00, 11 September 2009

2009-09-11T01:00:41Z

Cpg at 01:00, 11 September 2009

2009-09-11T01:00:20Z

Cpg: New page: == References == * Good [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial reference tutorial on diff and patch]

2009-09-10T23:25:45Z

New page: == References == * Good [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial reference tutorial on diff and patch]

New page

== References ==

* Good [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial reference tutorial on diff and patch]

@@ Line 14: / Line 14: @@
           diff -r -N -b -u html.orig html > app-patch.diff
 * This then can go into the install script as follows:
-          patch -p0 -E << EOF
+          patch -p0 -E << 'EOF'
           .... contents of app-patch.diff here ....
-          EOF
+          'EOF'
 Note: If patching a single file above, after the 'patch -p0 -E' and before the '<< EOF', insert the filename of file to be patched. Otherwise, installer will attempt to prompt for File to patch and then skip immediately since its automated.

← Older revision		Revision as of 17:45, 12 September 2009
Line 36:		Line 36:

	patch -p0 -E < app-patch.diff		patch -p0 -E < app-patch.diff
		+
		+	There is a --dry-run option for patch that lends itself useful for previewing the patch without it actually patching files.

	Doing this '''will''' save you a lot of trial-and-error in the installer.		Doing this '''will''' save you a lot of trial-and-error in the installer.

← Older revision		Revision as of 16:31, 12 September 2009
Line 17:		Line 17:
	.... contents of app-patch.diff here ....		.... contents of app-patch.diff here ....
	EOF		EOF
		+
		+	Note: If patching a single file above, after the 'patch -p0 -E' and before the '<< EOF', insert the filename of file to be patched. Otherwise, installer will attempt to prompt for File to patch and then skip immediately since its automated.

← Older revision		Revision as of 01:11, 11 September 2009
Line 36:		Line 36:

	Doing this '''will''' save you a lot of trial-and-error in the installer.		Doing this '''will''' save you a lot of trial-and-error in the installer.
		+
		+	If you have an problems, remove html and then
		+
		+	cp -a html.pristine html
		+
		+	(or unpack the app again and rename it to make the root html/)

	== References ==		== References ==

← Older revision		Revision as of 01:10, 11 September 2009
Line 1:		Line 1:
−	This is a technique to	+	This is an "advanced" technique for install scripts to

	* Reduce the size of install scripts		* Reduce the size of install scripts

@@ Line 3: / Line 3: @@
 * Reduce the size of install scripts
 * Make them more forward compatible for the future
-* Make them
+* Make them more robust
 == The Idea ==

← Older revision		Revision as of 01:00, 11 September 2009
Line 1:		Line 1:
		+	This is a technique to
		+
		+	* Reduce the size of install scripts
		+	* Make them more forward compatible for the future
		+	* Make them
		+
		+	== The Idea ==
		+
		+	The idea is simple: install by hand, make changes to make it work, then compare against the pristine sources, generating a patch that later does automatically what you did by hand
		+
		+	* Setup the app for installation as a webapp (say in html). Save a pristine copy as html.orign
		+	* Make changes in html/ only
		+	* Find out the diff of what you made:
		+	diff -r -N -b -u html.orig html > app-patch.diff
		+	* This then can go into the install script as follows:
		+	patch -p0 -E << EOF
		+	.... contents of app-patch.diff here ....
		+	EOF
		+
		+
		+	== Testing the patch ahead of time ==
		+
		+	It is strongly encouraged that you test the patch before attempting trial-and-error runs in the install script, which can be time consuming and error prone. This is basically simulating the install script applying the patch.
		+
		+	To do this, do this:
		+
		+	mv html html.modified
		+	cp -a html.orig html
		+	mv html.orig html.pristine
		+
		+	(the last step is to prevent patch from accidentally patching html.orig)
		+
		+	then try your patch against html dir (which is now like the original):
		+
		+	patch -p0 -E < app-patch.diff
		+
		+	Doing this '''will''' save you a lot of trial-and-error in the installer.

	== References ==		== References ==

	* Good [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial reference tutorial on diff and patch]		* Good [http://www.linuxtutorialblog.com/post/introduction-using-diff-and-patch-tutorial reference tutorial on diff and patch]
		+	* [http://stephenjungels.com/jungels.net/articles/diff-patch-ten-minutes.html Ten minute guide to diff and patch]