rarian/patches/rarian-0.8.0-posix-getopt.patch

diff -ur a/util/rarian-sk-update.in b/util/rarian-sk-update.in
--- a/util/rarian-sk-update.in	2007-09-01 18:22:35 +0100
+++ b/util/rarian-sk-update.in	2007-10-18 15:27:42 +0100
@@ -258,10 +258,7 @@
 # They are inherited from scrollkeeper :(
 
 # We use TEMP as set -- seems to nuke the return value of getopt
-TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
-    --longoptions="clean-index,omf-dir:,resulting-dir:,help,version" -- "$@"` \
-    || print_usage
-
+TEMP=`getopt "o:r:p:cvqnhV" "$@"`
 if [ $? != 0 ] ; then
 	print_usage
 	exit 0
@@ -271,12 +268,12 @@
 
 while true; do
     case "$1" in
-		-o | --omf-dir )
+		-o )
 			convert_dir=$2
 			update_output_dir=1
 			shift 2
 			;;
-		-r | --result-dir )
+		-r )
 			output_dir=$2
 			overload_update=1
 			shift 2
@@ -288,7 +285,7 @@
 		-q )
 			shift
 			;;
-        --clean-index )
+        -c )
         	clean_index=1
 			shift
             ;;	      
@@ -299,9 +296,9 @@
 			# Scrollkeeper compat.  Actually do nothing
 			shift
 			;;
-	        -p )
-	                statedir=$2
-	                shift 2
+	    -p )
+	        statedir=$2
+	        shift 2
 			;;
 		-V | --version )
 			print_version
@@ -416,4 +413,4 @@
 fi
 rm -rf $tmpdir
 
-fi # ENABLE_OMF_READ
\ No newline at end of file
+fi # ENABLE_OMF_READ
1	niro	558	diff -ur a/util/rarian-sk-update.in b/util/rarian-sk-update.in
2			--- a/util/rarian-sk-update.in 2007-09-01 18:22:35 +0100
3			+++ b/util/rarian-sk-update.in 2007-10-18 15:27:42 +0100
4			@@ -258,10 +258,7 @@
5			# They are inherited from scrollkeeper :(
6
7			# We use TEMP as set -- seems to nuke the return value of getopt
8			-TEMP=`getopt -u -n$(basename $0) -o "o:r:p:vqnhV" \
9			- --longoptions="clean-index,omf-dir:,resulting-dir:,help,version" -- "$@"` \
10			- \|\| print_usage
11			-
12			+TEMP=`getopt "o:r:p:cvqnhV" "$@"`
13			if [ $? != 0 ] ; then
14			print_usage
15			exit 0
16			@@ -271,12 +268,12 @@
17
18			while true; do
19			case "$1" in
20			- -o \| --omf-dir )
21			+ -o )
22			convert_dir=$2
23			update_output_dir=1
24			shift 2
25			;;
26			- -r \| --result-dir )
27			+ -r )
28			output_dir=$2
29			overload_update=1
30			shift 2
31			@@ -288,7 +285,7 @@
32			-q )
33			shift
34			;;
35			- --clean-index )
36			+ -c )
37			clean_index=1
38			shift
39			;;
40			@@ -299,9 +296,9 @@
41			# Scrollkeeper compat. Actually do nothing
42			shift
43			;;
44			- -p )
45			- statedir=$2
46			- shift 2
47			+ -p )
48			+ statedir=$2
49			+ shift 2
50			;;
51			-V \| --version )
52			print_version
53			@@ -416,4 +413,4 @@
54			fi
55			rm -rf $tmpdir
56
57			-fi # ENABLE_OMF_READ
58			\ No newline at end of file
59			+fi # ENABLE_OMF_READ