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