[patch] The etc-update patch.

etc-update.patch (text/plain), 1.61 KB, created by Marius Capmare on 2007-11-09 22:44:37 UTC

--- etc-update.orig	2007-11-04 03:16:50.000000000 +0000
+++ etc-update	2007-11-09 16:14:01.000000000 +0000
@@ -332,34 +332,35 @@
 				echo
 			fi
 			echo -n "File: ${file}
-1) Replace original with update
-2) Delete update, keeping original as is
-3) Interactively merge original with update
-4) Show differences again
-Please select from the menu above (-1 to ignore this update): "
+r) Replace original with update
+d) Delete update, keeping original as is
+m) Interactively merge original with update
+s) Show differences again
+i) Ignore this update
+Please select from the menu above: "
 			my_input=$(read_int)
 		fi
 
 		case ${my_input} in
-			1) echo "Replacing ${ofile} with ${file}"
-			   mv ${mv_opts} ${file} ${ofile}
-			   [ -n "${OVERWRITE_ALL}" ] && my_input=-1
-			   continue
-			   ;;
-			2) echo "Deleting ${file}"
-			   rm ${rm_opts} ${file}
-			   [ -n "${DELETE_ALL}" ] && my_input=-1
-			   continue
-			   ;;
-			3) do_merge "${file}" "${ofile}"
-			   my_input=${?}
-#			   [ ${my_input} == 255 ] && my_input=-1
-			   continue
-			   ;;
-			4) continue
-			   ;;
-			*) continue
-			   ;;
+			r|R) echo "Replacing ${ofile} with ${file}"
+			     mv ${mv_opts} ${file} ${ofile}
+			     [ -n "${OVERWRITE_ALL}" ] && my_input=-1
+			     continue
+			     ;;
+			d|D) echo "Deleting ${file}"
+			     rm ${rm_opts} ${file}
+			     [ -n "${DELETE_ALL}" ] && my_input=-1
+			     continue
+			     ;;
+			m|M) do_merge "${file}" "${ofile}"
+			     my_input=${?}
+#			     [ ${my_input} == 255 ] && my_input=-1
+			     continue
+			     ;;
+			s|S) continue
+			     ;;
+			  *) continue
+			     ;;
 		esac
 	done
 }