- Fixed usage in other shells than bash: minor compatibility code changes

and no complains because completion doesn't work (fix BZ#479398).
This commit is contained in:
Miloš Jakubíček 2009-01-11 21:17:36 +00:00
commit 4dd5411121
2 changed files with 26 additions and 1 deletions

View file

@ -7,6 +7,27 @@ diff -Naur cdargs-1.35/contrib/cdargs-bash.sh cdargs-1.35_patched/contrib/cdargs
# (C) 2002-2003 Dan Allen and Stefan Kamphausen
# Written by Dan Allen <dan@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

View file

@ -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 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Jan 11 2009 Milos Jakubicek <xjakub@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@fi.muni.cz> - 1.35-2
- Fixed non-capital starting letter in the summary of emacs-cdargs subpackage.