summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2013-12-17 22:36:50 +0100
committerMartin Väth <martin@mvath.de>2015-10-11 10:49:04 +0200
commit49226624914539cfc68377dd98a61b7f65bf88d5 (patch)
treeb99a4ac192381954342b40c5defd003c1fb13f38 /media-video
parentBump zsh, simplifying ebuild, improving live ebuild (diff)
downloadmv-49226624914539cfc68377dd98a61b7f65bf88d5.tar.gz
mv-49226624914539cfc68377dd98a61b7f65bf88d5.tar.bz2
mv-49226624914539cfc68377dd98a61b7f65bf88d5.zip
Fix paths of binaries and of sourced scripts
Diffstat (limited to 'media-video')
-rw-r--r--media-video/video-mv/ChangeLog6
-rw-r--r--media-video/video-mv/video-mv-7.13-r1.ebuild (renamed from media-video/video-mv/video-mv-7.13.ebuild)14
2 files changed, 15 insertions, 5 deletions
diff --git a/media-video/video-mv/ChangeLog b/media-video/video-mv/ChangeLog
index 92165b8a..5b7b9f24 100644
--- a/media-video/video-mv/ChangeLog
+++ b/media-video/video-mv/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*video-mv-7.13-r1 (17 Dec 2013)
+
+ 17 Dec 2013; Martin Väth <martin@mvath.de>:
+ _videoscript.sh -> /usr/share/video-mv: not meant to be called by the user.
+ Fix sh path
+
*video-mv-7.13 (09 Dec 2013)
09 Dec 2013; Martin Väth <martin@mvath.de>:
diff --git a/media-video/video-mv/video-mv-7.13.ebuild b/media-video/video-mv/video-mv-7.13-r1.ebuild
index 662424fa..1ca10991 100644
--- a/media-video/video-mv/video-mv-7.13.ebuild
+++ b/media-video/video-mv/video-mv-7.13-r1.ebuild
@@ -29,9 +29,10 @@ into your ~/.zshrc or /etc/zshrc for case-insensitive matching."
src_prepare() {
local i
use prefix || for i in bin/*
- do test -h "${i}" || \
- sed -i -e '1s"^#!/usr/bin/env sh$"#!'"$(command -v sh)"'"' -- "${i}" \
- || die
+ do test -h "${i}" || sed -i \
+ -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
+ -e 's"^\. _videoscript\.sh$". '"${EPREFIX}/usr/share/video-mv/_videoscript.sh"'"' \
+ -- "${i}" || die
done
epatch_user
}
@@ -40,11 +41,14 @@ src_install() {
local i
insinto /usr/bin
for i in bin/*
- do if test -h "${i}" || ! test -x "${i}"
+ do if test -h "${i}"
then doins "${i}"
- else dobin "${i}"
+ elif [ "${i#*/}" != '_videoscript.sh' ]
+ then dobin "${i}"
fi
done
+ insinto /usr/share/video-mv
+ doins bin/_videoscript.sh
insinto /etc
doins etc/*
insinto /usr/share/zsh/site-functions