* [gentoo-commits] proj/webapp-config:master commit in: sbin/
@ 2011-12-29 21:31 Anthony G. Basile
0 siblings, 0 replies; 4+ messages in thread
From: Anthony G. Basile @ 2011-12-29 21:31 UTC (permalink / raw
To: gentoo-commits
commit: 37751374b477b36ebcb600fa430c1379429a63e0
Author: Michael (kensington) <gentoo <AT> scribeofthenile <DOT> com>
AuthorDate: Thu Dec 29 21:29:02 2011 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 21:30:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=37751374
Backward compat for webapp-cleaner
Patch webapp-cleaner to check ${CAT}/${PN} first, but if that
does not exist, fall back to just ${PN}.
Reported-By: Marc Richter <richter_marc <AT> gmx.net>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
X-Gentoo-Bug: 376737
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=376737
---
sbin/webapp-cleaner | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
index 20ca8bd..bfec623 100755
--- a/sbin/webapp-cleaner
+++ b/sbin/webapp-cleaner
@@ -2,6 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
+ATOM=
+CAT=
PN=
ACTION=
@@ -56,12 +58,12 @@ function sanity_checks() {
exit 1
fi
- if [[ $(expr index "${PN}" "/") == "0" ]] ; then
+ if [[ "${CAT}x" == "x" || "${PN}x" == "x" ]]; then
eerror "Package name must be in the form CATEGORY/PN"
exit 1
fi
- if [[ ! -d "${WEBAPP_DIR}/${PN}" ]]; then
+ if [[ ! -d "${WEBAPP_DIR}/${CAT}/${PN}" && ! -d "${WEBAPP_DIR}/${PN}" ]]; then
eerror "${PN} not found"
exit 1
fi
@@ -133,7 +135,8 @@ function process_opts() {
ACTION="help"
;;
*)
- PN="$1"
+ ATOM="${1}"
+ parse_atom
;;
esac
@@ -141,6 +144,12 @@ function process_opts() {
done
}
+parse_atom() {
+ local pos=$(expr index "${ATOM}" "/")
+ CAT=${ATOM:0:$pos - 1}
+ PN=${ATOM:$pos}
+}
+
process_opts $@
sanity_checks
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/webapp-config:master commit in: sbin/
@ 2014-03-11 23:17 Devan Franchini
0 siblings, 0 replies; 4+ messages in thread
From: Devan Franchini @ 2014-03-11 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 227ba000dcdbb10c5dba88dbbb4e3d1e900d1d3b
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 23:19:49 2014 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 23:19:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=227ba000
sbin/webapp-cleaner: alters source to /lib/gentoo/functions.sh
---
sbin/webapp-cleaner | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
index bfec623..52e44ac 100755
--- a/sbin/webapp-cleaner
+++ b/sbin/webapp-cleaner
@@ -13,7 +13,7 @@ CMD="emerge -Cav"
WEBAPP_DIR="/usr/share/webapps"
WEBAPP_CONFIG=
-[[ -z ${RC_GOT_FUNCTIONS} ]] && source /etc/init.d/functions.sh
+[[ -z ${RC_GOT_FUNCTIONS} ]] && source /lib/gentoo/functions.sh
function help() {
echo "Remove obsolete and unused versions of web applications"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/webapp-config:master commit in: sbin/
@ 2015-07-03 2:41 Devan Franchini
0 siblings, 0 replies; 4+ messages in thread
From: Devan Franchini @ 2015-07-03 2:41 UTC (permalink / raw
To: gentoo-commits
commit: 02a7f5e2f1754692c3e8d6f8ac9a38dd1a29fede
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 3 02:41:36 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 02:41:36 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=02a7f5e2
webapp-cleaner: Fixed incorrect use of -lui flag
sbin/webapp-cleaner | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
index 52e44ac..ee053a1 100755
--- a/sbin/webapp-cleaner
+++ b/sbin/webapp-cleaner
@@ -95,7 +95,7 @@ function prune() {
}
function clean_unused() {
- local output=$(${WEBAPP_CONFIG} --lui ${PN})
+ local output=$(${WEBAPP_CONFIG} -lui ${PN})
if [[ -z ${output} ]] ; then
einfo "Nothing to clean"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] proj/webapp-config:1.54 commit in: sbin/
@ 2015-07-03 4:55 Devan Franchini
2015-07-03 4:50 ` [gentoo-commits] proj/webapp-config:master " Devan Franchini
0 siblings, 1 reply; 4+ messages in thread
From: Devan Franchini @ 2015-07-03 4:55 UTC (permalink / raw
To: gentoo-commits
commit: 3b9eb3b3b61e626f1a7ad72d06072cc9bc948c8e
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 3 02:41:36 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jul 3 04:49:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/webapp-config.git/commit/?id=3b9eb3b3
webapp-cleaner: Fixed incorrect use of -lui flag
sbin/webapp-cleaner | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sbin/webapp-cleaner b/sbin/webapp-cleaner
index 52e44ac..ee053a1 100755
--- a/sbin/webapp-cleaner
+++ b/sbin/webapp-cleaner
@@ -95,7 +95,7 @@ function prune() {
}
function clean_unused() {
- local output=$(${WEBAPP_CONFIG} --lui ${PN})
+ local output=$(${WEBAPP_CONFIG} -lui ${PN})
if [[ -z ${output} ]] ; then
einfo "Nothing to clean"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-07-03 4:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-29 21:31 [gentoo-commits] proj/webapp-config:master commit in: sbin/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2014-03-11 23:17 Devan Franchini
2015-07-03 2:41 Devan Franchini
2015-07-03 4:55 [gentoo-commits] proj/webapp-config:1.54 " Devan Franchini
2015-07-03 4:50 ` [gentoo-commits] proj/webapp-config:master " Devan Franchini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox