rpms/cdargs/F-9 cdargs-1.35_shebangs.patch, 1.1, 1.2 cdargs.spec, 1.1, 1.2

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/cdargs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28987

Modified Files:
	cdargs-1.35_shebangs.patch cdargs.spec 
Log Message:
- Fixed usage in other shells than bash: minor compatibility code changes and
  no complains because completion doesn't work (fix BZ#479398).



cdargs-1.35_shebangs.patch:

Index: cdargs-1.35_shebangs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/F-9/cdargs-1.35_shebangs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs-1.35_shebangs.patch	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs-1.35_shebangs.patch	11 Jan 2009 21:37:25 -0000	1.2
@@ -7,6 +7,27 @@
  # (C) 2002-2003 Dan Allen and Stefan Kamphausen
  
  # Written by Dan Allen <dan at mojavelinux.com>
+@@ -166,7 +164,7 @@
+     local tmpfile
+
+     # first clear any bookmarks with this same alias, if file exists
+-    if [[ "$CDARGS_NODUPS" && -e "$HOME/.cdargs" ]]; then
++    if [ "$CDARGS_NODUPS" -a -e "$HOME/.cdargs" ]; then
+         tmpfile=`echo ${TEMP:-${TMPDIR:-/tmp}} | sed -e "s/\\/$//"`
+         tmpfile=$tmpfile/cdargs.$USER.$$.$RANDOM
+         grep -v "^$1 " "$HOME/.cdargs" > $tmpfile && 'mv' -f $tmpfile "$HOME/.cdargs";
+@@ -256,4 +254,11 @@
+   complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb
+ }
+
++# we do not support anything besides bash completion
++# (however patches to support other shells are very welcome)
++
++if [ -z "${BASH_VERSION}" ]; then
++    return 100
++fi
++
+ _cdargs_complete
 diff -Naur cdargs-1.35/contrib/cdargs-tcsh.csh cdargs-1.35_patched/contrib/cdargs-tcsh.csh
 --- cdargs-1.35/contrib/cdargs-tcsh.csh	2005-11-06 11:58:13.000000000 +0100
 +++ cdargs-1.35_patched/contrib/cdargs-tcsh.csh	2008-03-08 11:02:29.000000000 +0100


Index: cdargs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cdargs/F-9/cdargs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdargs.spec	26 Mar 2008 17:13:19 -0000	1.1
+++ cdargs.spec	11 Jan 2009 21:37:25 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		cdargs
 Version:	1.35
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The shell cd with bookmarks and browser
 
 Group:		Applications/File
@@ -83,6 +83,10 @@
 
 %changelog
 
+* Sun Jan 11 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-3
+- Fixed usage in other shells than bash: minor compatibility code changes and 
+  no complains because completion doesn't work (fix BZ#479398).
+
 * Tue Mar 25 2008 Milos Jakubicek <xjakub at fi.muni.cz> - 1.35-2
 - Fixed non-capital starting letter in the summary of emacs-cdargs subpackage.