YunoHost-Apps/rss-bridge_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/rss-bridge_ynh.git synced 2024-09-03 20:25:51 +02:00
Code Issues Activity Actions

Don't rely on USER variable (fixes #4)

Browse source
This commit is contained in:
Jimmy Monin 2018-09-15 17:57:35 +02:00
parent 146f6eef7f
commit 6def2b947b
1 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/_common.sh
View file

@ -35,20 +35,10 @@ exec_as() {
fi fi
} }
# Execute a command through the wallabag console
# usage: exec_console AS_USER WORKDIR COMMAND [ARG ...]
exec_console() {
local AS_USER=$1
local WORKDIR=$2
shift 2
exec_as "$AS_USER" php "$WORKDIR/bin/console" --no-interaction --env=prod "$@"
}
# Download and extract sources to the given directory # Download and extract sources to the given directory
# usage: extract_sources DESTDIR [AS_USER] # usage: extract_sources DESTDIR
extract_sources() { extract_sources() {
local DESTDIR=$1 local DESTDIR=$1
local AS_USER=${2:-$USER}
# retrieve and extract Roundcube tarball # retrieve and extract Roundcube tarball
wb_tarball="/tmp/sources.tar.gz" wb_tarball="/tmp/sources.tar.gz"
@ -57,7 +47,7 @@ extract_sources() {
|| ynh_die "Unable to download sources tarball" || ynh_die "Unable to download sources tarball"
echo "$SOURCE_SHA256 $wb_tarball" | sha256sum -c >/dev/null \ echo "$SOURCE_SHA256 $wb_tarball" | sha256sum -c >/dev/null \
|| ynh_die "Invalid checksum of downloaded tarball" || ynh_die "Invalid checksum of downloaded tarball"
exec_as "$AS_USER" tar xf "$wb_tarball" -C "$DESTDIR" --strip-components 1 \ tar xf "$wb_tarball" -C "$DESTDIR" --strip-components 1 \
|| ynh_die "Unable to extract sources tarball" || ynh_die "Unable to extract sources tarball"
rm -f "$wb_tarball" rm -f "$wb_tarball"