summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/portage/package.accept_keywords/conf3
-rwxr-xr-xroot/posodobi.sh26
2 files changed, 25 insertions, 4 deletions
diff --git a/etc/portage/package.accept_keywords/conf b/etc/portage/package.accept_keywords/conf
index 9f8685f..90a44a7 100644
--- a/etc/portage/package.accept_keywords/conf
+++ b/etc/portage/package.accept_keywords/conf
@@ -35,3 +35,6 @@ dev-lang/arc ~*
dev-util/pmbootstrap ~*
net-analyzer/wpscan ~*
app-crypt/fcrackzip ~*
+games-util/lutris ~*
+net-im/abaddon ~*
+media-video/avidemux ~*
diff --git a/root/posodobi.sh b/root/posodobi.sh
index 662aac2..c8d45f0 100755
--- a/root/posodobi.sh
+++ b/root/posodobi.sh
@@ -1,10 +1,28 @@
#!/bin/bash
+if grep "cron" <<<"$@" > /dev/null
+then
+ i=`sed s,^./,,g <<<$0`
+ t=`mktemp -p "" $i.XXX.html`
+ status=$?
+ if [ ! $status -eq 0 ]
+ then
+ echo začasne datoteke ni uspelo izdelati. mktemp je končal s $status.
+ exit 1
+ fi
+ $0 --no-ask --colour 2>&1 | aha --black --title "`hostname` $0 cron `date`" > $t
+ status=$?
+ if [ ! $status -eq 0 ]
+ then
+ echo posodobitev ni uspela. $0 je končal s $status. izhod je dostopen na http://`hostname`.sijanec.eu/$t
+ fi
+ exit $status
+fi
set -xe
f=
-a=
grep "no-sync" <<<"$@" || /usr/sbin/emaint sync --auto
grep "no-ask" <<<"$@" || f=--ask
-[ `hostname` = varovalka ] && a=--exclude=media-libs/mesa
-emerge --tree --verbose --update $f $a --newuse --changed-use --backtrack 30 --deep --with-bdeps=y --rebuilt-binaries --autounmask --autounmask-write @world
-emerge @preserved-rebuild
+grep "colo" <<<"$@" || f="$f --color y"
+[ `hostname` = varovalka ] && f="$f --exclude=media-libs/mesa"
+emerge --tree --verbose --update $f --newuse --changed-use --backtrack 30 --deep --with-bdeps=y --rebuilt-binaries --autounmask --autounmask-write @world
+emerge @preserved-rebuild --autounmask-write
emerge --depclean