diff options
Diffstat (limited to 'trunk')
| -rw-r--r-- | trunk/ChangeLog | 3 | ||||
| -rw-r--r-- | trunk/Makefile | 3 | ||||
| -rwxr-xr-x | trunk/release.sh | 5 | ||||
| -rwxr-xr-x | trunk/src/euse/euse | 7 | ||||
| -rw-r--r-- | trunk/src/glsa-check/Makefile | 1 |
5 files changed, 17 insertions, 2 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index be0a39c..3889277 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -1,3 +1,6 @@ +2005-04-07 Marius Mauch <genone@gentoo.org> + * euse: fixed bugs 74344, 75525 and 84521 + 2005-03-12 Aron Griffis <agriffis@gentoo.org> * Added eviewcvs to -dev, utility for generating viewcvs URLs diff --git a/trunk/Makefile b/trunk/Makefile index 7a1693f..58f5385 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -16,6 +16,9 @@ all: echo $(sbindir) echo $(mandir) +clean: + rm -rf release/* + dist: echo "Err0r: Must use either dist-gentoolkit or dist-gentoolkit-dev" exit 1 diff --git a/trunk/release.sh b/trunk/release.sh index 2c8b937..cee80c1 100755 --- a/trunk/release.sh +++ b/trunk/release.sh @@ -10,6 +10,11 @@ elif [ "$(whoami)" == "port001" ] ; then publish_public_path="http://dev.gentoo.org/~port001/distfiles/gentoolkit/releases" portdir=/home/port001/Gentoo/gentoo-x86/ export ECHANGELOG_USER="Ian Leitch <port001@gentoo.org>" +elif [ "$(whoami)" == "genone" ]; then + publish_path=dev:public_html/distfiles/ + publish_public_path="http://dev.gentoo.org/~genone/distfiles/" + portdir=/home/gentoo/cvs/gentoo-x86/ + export ECHANGELOG_USER="Marius Mauch <genone@gentoo.org>" else echo "!!! Don't know who $(whoami) is, can't release" exit 1 diff --git a/trunk/src/euse/euse b/trunk/src/euse/euse index f2972ad..d663233 100755 --- a/trunk/src/euse/euse +++ b/trunk/src/euse/euse @@ -47,6 +47,7 @@ parse_arguments() { error() { echo "ERROR: ${1}" + set +f exit 1 } @@ -58,7 +59,7 @@ check_sanity() { [ ! -r "${MAKE_CONF_PATH}" ] && error "${MAKE_CONF_PATH} is not readable" [ ! -r "${MAKE_GLOBALS_PATH}" ] && error "${MAKE_GLOBALS_PATH} is not readable" - [ ! -s "${MAKE_PROFILE_PATH}" ] && error "${MAKE_PROFILE_PATH} is not a symlink" + [ ! -h "${MAKE_PROFILE_PATH}" ] && error "${MAKE_PROFILE_PATH} is not a symlink" [ -z "$(get_portdir)" ] && error "\$PORTDIR couldn't be determined" [ ! -d "${descdir}" ] && error "${descdir} does not exist or is not a directory" [ ! -r "${descdir}/use.desc" ] && error "${descdir}/use.desc is not readable" @@ -154,7 +155,7 @@ get_make_defaults() { curdir="$(readlink -f ${MAKE_PROFILE_PATH})" while [ ! -f "${curdir}/make.defaults" -a -f "${curdir}/parent" ]; do - parent="$(grep -v '(^#|^ *$)' ${curdir}/parent)" + parent="$(egrep -v '(^#|^ *$)' ${curdir}/parent)" curdir="$(readlink -f ${curdir}/${parent})" done @@ -383,7 +384,9 @@ modify() { ##### main program comes now ##### +set -f parse_arguments "$@" check_sanity eval ${MODE} ${ARGUMENTS} +set +f diff --git a/trunk/src/glsa-check/Makefile b/trunk/src/glsa-check/Makefile index 8c6fa6d..a3f1044 100644 --- a/trunk/src/glsa-check/Makefile +++ b/trunk/src/glsa-check/Makefile @@ -14,5 +14,6 @@ dist: cp Makefile glsa.py glsa-check ../../$(distdir)/src/glsa-check/ install: + install -d $(DESTDIR)/usr/lib/gentoolkit/pym/ install -m 0755 glsa-check $(bindir)/ install -m 0644 glsa.py $(DESTDIR)/usr/lib/gentoolkit/pym/ |