misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>

5 files changed, 6 insertions, 16 deletions

diff --git a/remotes/seblu-archutils b/remotes/seblu-archutils
-Subproject ea77a07ef9772fe21a6fbba609d5fea26c58c9d
+Subproject 5e60f8582d93f34a8f136113de939fd18005ace
diff --git a/remove-vm.sh b/remove-vm.sh
index b12cb8b..3ee44df 100755
--- a/remove-vm.sh
+++ b/remove-vm.sh
@@ -9,5 +9,5 @@ fi
 
 virsh destroy $name
 virsh undefine $name
-virsh vol-delete $name.img default
+virsh vol-delete $name.img --pool default
 
diff --git a/screen-locker.sh b/screen-locker.sh
index 6412374..7dfa69c 100755
--- a/screen-locker.sh
+++ b/screen-locker.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
 if pidof i3lock &> /dev/null; then exit 1; fi
+xset dpms force off
 exec i3lock -d -c 000000
diff --git a/upgpkg b/upgpkg
index 1c58296..2ddc282 100755
--- a/upgpkg
+++ b/upgpkg
@@ -99,22 +99,11 @@ scriptlet pre_upgrade
 if [[ $(vercmp $1 $pkgver) -le 0 ]]; then
     warn "New version (%s) older or equal to current %s" "$1" "$pkgver"
 fi
-
+setconf PKGBUILD pkgver="$_newpkgver"
+setconf PKGBUILD pkgrel=1
 sed -i "s/pkgver=.*$/pkgver=$_newpkgver/g" PKGBUILD
 sed -i "s/pkgrel=.*$/pkgrel=1/g" PKGBUILD
-makepkg -g || exit 1
-# replace the first checksum line with all checksums, remove all other checksums
-# TODO: this doesn't work if there are no checksum lines or if the makepkg call
-# inside the awk script doesn't return anything
-# original awk by Pierre https://projects.archlinux.de/kde-build.git/tree/common/updpkg
-awk <PKGBUILD '
-$0 ~ /^(md5|sha[0-9]+)sums/ {
-	i = 1;
-	if(!run==1) {system("makepkg -g 2>/dev/null")};
-	run=1;
-};
-!i {print};
-$0 ~ /\)/ {i = 0}' | sponge PKGBUILD
+updpkgsums
 
 makepkg --verifysource -d
 
diff --git a/video-crop-detect b/video-crop-detect
index df250f0..45d139b 100755
--- a/video-crop-detect
+++ b/video-crop-detect
@@ -1,3 +1,3 @@
 #!/bin/sh
 set -x
-mplayer `mplayer -ao null -ss 60 -frames 100 -vf cropdetect -vo null "$1" | awk -F '[()]' '{print $2}' | uniq | grep -Ev 'End of file' | tail -2` "$1"
+mplayer $(mplayer -ao null -ss 60 -frames 100 -vf cropdetect -vo null "$1" | awk -F '[()]' '{print $2}' | uniq | grep -Ev 'End of file' | tail -2) "$1"