summaryrefslogtreecommitdiff
path: root/user/vlc
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-07-22 19:43:53 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-07-22 19:43:53 +0000
commitb7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71 (patch)
tree5948e97345062a759a5ab8d355b0b49849abcfcf /user/vlc
parentd61220e97e3a4fec8c1e43970cb1408f790c2c2e (diff)
parent6bd200ed124893c95fda0335b684b26eba0bb743 (diff)
downloadpackages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.gz
packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.bz2
packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.tar.xz
packages-b7ffaa4d55e1faf4de0f8e6a2edf372fedfeaf71.zip
Merge branch 'bashisms' into 'master'
Purge bashisms, adduser, and addgroup from packages.git See merge request adelie/packages!293
Diffstat (limited to 'user/vlc')
-rw-r--r--user/vlc/APKBUILD4
-rw-r--r--user/vlc/vlc-daemon.pre-install16
-rw-r--r--user/vlc/vlc-libs.trigger2
3 files changed, 8 insertions, 14 deletions
diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD
index f5be9f620..6bd76fafe 100644
--- a/user/vlc/APKBUILD
+++ b/user/vlc/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=vlc
pkgver=3.0.7.1
-pkgrel=0
+pkgrel=1
pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player"
triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
pkgusers="vlc"
@@ -142,7 +142,7 @@ check() {
}
_mv() {
- local dir=${1%/*}
+ local dir="${1%/*}"
mkdir -p "$subpkgdir"/$dir
mv "$1" "$subpkgdir"/$dir/
}
diff --git a/user/vlc/vlc-daemon.pre-install b/user/vlc/vlc-daemon.pre-install
index aed6c1893..5ebf91ac7 100644
--- a/user/vlc/vlc-daemon.pre-install
+++ b/user/vlc/vlc-daemon.pre-install
@@ -1,15 +1,9 @@
#!/bin/sh
-groups="vlc audio video"
-
-for group in $groups; do
- addgroup -S $group 2>/dev/null
-done
-adduser -S -D -h /home/vlc -s /bin/sh -G vlc -g vlc vlc 2>/dev/null
-
-# make sure vlc are in all groups
-for group in $groups; do
- addgroup vlc $group 2>/dev/null
-done
+groupadd -r vlc 2>/dev/null
+groupadd -r audio 2>/dev/null
+groupadd -r video 2>/dev/null
+useradd -c vlc -s /sbin/nologin -g vlc -G audio,video \
+ -m -d /home/vlc -r vlc 2>/dev/null
exit 0
diff --git a/user/vlc/vlc-libs.trigger b/user/vlc/vlc-libs.trigger
index c13bace99..163806314 100644
--- a/user/vlc/vlc-libs.trigger
+++ b/user/vlc/vlc-libs.trigger
@@ -1,5 +1,5 @@
#!/bin/sh
-exec /usr/lib/vlc/vlc-cache-gen "$@" >&/dev/null
+exec /usr/lib/vlc/vlc-cache-gen "$@" >/dev/null 2>&1
exit 0