From 808f7ade85061ab0132cea9af30b6d01bff02f43 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 14:16:04 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for cdargs --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 7197094bdb44dfe492837e5cb815908835e6d5c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Jakub=C3=AD=C4=8Dek?= Date: Sun, 11 Jan 2009 21:37:25 +0000 Subject: [PATCH 2/4] - 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 | 21 +++++++++++++++++++++ cdargs.spec | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/cdargs-1.35_shebangs.patch b/cdargs-1.35_shebangs.patch index 39d5e67..e7abb6e 100644 --- a/cdargs-1.35_shebangs.patch +++ b/cdargs-1.35_shebangs.patch @@ -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 +@@ -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 diff --git a/cdargs.spec b/cdargs.spec index f1e0826..5e1992c 100644 --- a/cdargs.spec +++ b/cdargs.spec @@ -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 - 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 - 1.35-2 - Fixed non-capital starting letter in the summary of emacs-cdargs subpackage. From 743b86d3cc86e510f1a65a9e1fb2e3d9b0c72fcd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:27:33 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 42fb702..d9116e0 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: cdargs -# $Id$ +# $Id: Makefile,v 1.1 2008/03/26 15:59:49 kevin Exp $ NAME := cdargs SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From baafa7af6a519f3d6fc1fcfdd22104c615d94a19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:30:28 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d9116e0..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: cdargs -# $Id: Makefile,v 1.1 2008/03/26 15:59:49 kevin Exp $ -NAME := cdargs -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9