İşlemeleri karşılaştır

2 İşleme

Yazar SHA1 Mesaj Tarih
f5842d1690 Fix pkg_update_cmd 2022-01-13 11:23:49 -05:00
be3c1998de Remove quotes from array elements 2022-01-13 11:03:13 -05:00

Dosyayı Görüntüle

@@ -245,8 +245,8 @@ getLatestVersion() {
# Containerized package manager
# TODO but how to determine build distro ($BASE=buster)?
installPackage --silent buildah
if cnt=$(buildah from debian:$BASE) &>/dev/null &&
if installPackage --silent buildah &&
cnt=$(buildah from debian:$BASE) &>/dev/null &&
buildah run "$cnt" -- bash -c \
"echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $BASE main' > /etc/apt/sources.list 2>&1" &&
buildah run "$cnt" -- bash -c \
@@ -261,7 +261,7 @@ getLatestVersion() {
else
MCVERSION="28.0.100"
VERSION_SOURCE="hardcoded version"
echo "Warning! Using hardcoded version number, this is probably not the latest"
err "Warning! Using hardcoded version number"
fi
}
@@ -290,9 +290,9 @@ installPackage() {
;;
--nogpgcheck)
if [[ "$ID" =~ ^(fedora|centos)$ ]]; then
install_flags+=("--nogpgcheck")
install_flags+=(--nogpgcheck)
elif [[ "$ID" =~ ^opensuse.* ]]; then
install_flags+=("--allow-unsigned-rpm")
install_flags+=(--allow-unsigned-rpm)
fi
;;
--silent|-s)
@@ -358,7 +358,7 @@ addRepo() {
EOF'
elif [[ "$ID" =~ ^(debian|ubuntu|linuxmint|neon)$ ]]; then
# MVERSION depends on $BASE unless --mcversion is passed
installPackage wget
installPackage --silent wget
declare sources_dir="/etc/apt/sources.list.d"
[[ ! -d "$sources_dir" ]] && sudo mkdir -p "$sources_dir"
sudo bash -c "cat <<- EOF > $sources_dir/mediacenter$MVERSION.list
@@ -390,6 +390,7 @@ installMCFromRepo() {
addRepo
# Update package list
pkg_update_cmd="pkg_update"
debug "$pkg_update_cmd" || pkg_update_cmd+=" &>/dev/null"
if ! eval "$pkg_update_cmd"; then
err "Package update failed!"
@@ -536,8 +537,8 @@ buildRPM() {
for i in "${!requires[@]}"; do
[[ "${requires[$i]}" == "mesa-vulkan-drivers" ]] && unset -v 'requires[i]'
done
recommends+=("libvulkan_intel")
recommends+=("libvulkan_radeon")
recommends+=(libvulkan_intel)
recommends+=(libvulkan_radeon)
;;
esac
@@ -738,10 +739,10 @@ openFirewall() {
declare -a f_ports # for firewall-cmd
declare u_ports # for ufw
if [[ "$1" == "jriver" ]]; then
f_ports=("52100-52200/tcp" "1900/udp")
f_ports=(52100-52200/tcp 1900/udp)
u_ports="52100:52200/tcp|1900/udp"
elif [[ "$1" =~ ^(jriver-x11vnc|jriver-xvnc)$ ]]; then
f_ports=("$PORT/tcp" "1900/udp")
f_ports=("$PORT"/tcp 1900/udp)
u_ports="$PORT/tcp|1900/udp"
fi
@@ -1210,13 +1211,13 @@ service_jriver-createrepo() {
# installPackage buildah podman
# cnt=$(buildah from docker.io/jlesage/baseimage-gui:debian-10)
# podman_create_cmd=("podman" "create" "--name" "$CNAME")
# buildah_config_cmd=("buildah" "config" \
# "--author" "bryanroessler@gmail.com" \
# "--label" "maintainer=$MAINTAINER" \
# "--env" "TZ=$TZ" \
# "--workingdir" "/app" \
# "--cmd" "mediacenter$MVERSION")
# podman_create_cmd=(podman create --name "$CNAME")
# buildah_config_cmd=(buildah config \
# --author bryanroessler@gmail.com \
# --label maintainer="$MAINTAINER" \
# --env TZ="$TZ" \
# --workingdir /app \
# --cmd mediacenter"$MVERSION")
# mkcdirs() {
# declare dir
@@ -1234,10 +1235,10 @@ service_jriver-createrepo() {
# mkcdirs "$HOME/.jriver"
# podman_create_cmd+=("-v" "$HOME/.jriver:/root/.jriver")
# podman_create_cmd+=("-v" "$DOWNLOAD_ROOT:/downloads:z")
# podman_create_cmd+=("-v" "$MONITOR_ROOT/nzbs:/nzbs")
# podman_create_cmd+=("-p" "${CONTAINER[HOST_PORT]}:${CONTAINER[CONTAINER_PORT]}")
# podman_create_cmd+=(-v "$HOME/.jriver:/root/.jriver")
# podman_create_cmd+=(-v "$DOWNLOAD_ROOT:/downloads:z")
# podman_create_cmd+=(-v "$MONITOR_ROOT/nzbs:/nzbs")
# podman_create_cmd+=(-p "${CONTAINER[HOST_PORT]}:${CONTAINER[CONTAINER_PORT]}")
# brc() { buildah run "$1" "${@:2}" || return 1; }