bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Disable arch in master

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-06 17:47:29 -05:00
parent 610d35f80f 3cc0f91766
commit 64442c5d41
1 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
installJRMC
View File

@@ -108,7 +108,6 @@ askOk() {
declare response declare response
read -r -p "$* [y/N]: " response read -r -p "$* [y/N]: " response
[[ "${response,,}" =~ ^(yes|y)$ ]] [[ "${response,,}" =~ ^(yes|y)$ ]]
return
} }
@@ -254,9 +253,9 @@ init() {
debug "Detected host platform: $ID $VERSION_ID" debug "Detected host platform: $ID $VERSION_ID"
# normalize ID # normalize ID and set distro-specific vars
case "$ID" in case "$ID" in
arch|debian) debian|arch)
;; ;;
centos|fedora) centos|fedora)
if hash dnf &>/dev/null; then if hash dnf &>/dev/null; then
@@ -383,8 +382,14 @@ setMCVersion() {
if [[ "$MCVERSION_SOURCE" == "user input" ]]; then if [[ "$MCVERSION_SOURCE" == "user input" ]]; then
# Append explicit package version when user provides --mcversion # Append explicit package version when user provides --mcversion
[[ "$ID" =~ ^(fedora|centos|suse)$ ]] && MCPKG+="-$MCVERSION" case "$ID" in
[[ "$ID" =~ ^(debian|ubuntu)$ ]] && MCPKG+="=$MCVERSION" fedora|centos|suse)
MCPKG+="-$MCVERSION"
;;
debian|ubuntu)
MCPKG+="=$MCVERSION"
;;
esac
fi fi
echo "Using MC version $MCVERSION determined by $MCVERSION_SOURCE." echo "Using MC version $MCVERSION determined by $MCVERSION_SOURCE."
[[ "$MCVERSION_SOURCE" == "user input" ]] || echo "To override, use --mcversion." [[ "$MCVERSION_SOURCE" == "user input" ]] || echo "To override, use --mcversion."
@@ -831,7 +836,7 @@ installMesa() {
installMCARCH() { installMCARCH() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
echo "Arch install under construction" echo "Arch install under construction"
# [[ ! -d "$OUTPUTDIR/PKGBUILD/" ]] && mkdir -p "$OUTPUTDIR/PKGBUILD" # [[ -d "$OUTPUTDIR/PKGBUILD" ]] || mkdir -p "$OUTPUTDIR/PKGBUILD"
# cat <<-EOF > "$OUTPUTDIR/PKGBUILD/mediacenter.pkgbuild" # cat <<-EOF > "$OUTPUTDIR/PKGBUILD/mediacenter.pkgbuild"
# pkgname=mediacenter$MVERSION # pkgname=mediacenter$MVERSION
# pkgver=$MCVERSION # pkgver=$MCVERSION
@@ -841,7 +846,8 @@ installMCARCH() {
# url="http://www.jriver.com/" # url="http://www.jriver.com/"
# license=('custom') # license=('custom')
# depends=('alsa-lib' 'gcc-libs' 'libx11' 'libxext' 'libxcb' 'libxau' 'libxdmcp' 'util-linux' 'libxext' 'gtk3') # depends=('alsa-lib' 'gcc-libs' 'libx11' 'libxext' 'libxcb' 'libxau' 'libxdmcp' 'util-linux' 'libxext' 'gtk3')
# optdepends=('mesa-libgl: nouveau video support' # optdepends=(
# 'mesa-libgl: nouveau video support'
# 'nvidia-libgl: nvidia video support' # 'nvidia-libgl: nvidia video support'
# 'nvidia-utils: nvidia vulkan support' # 'nvidia-utils: nvidia vulkan support'
# 'vulkan-intel: intel vulkan support' # 'vulkan-intel: intel vulkan support'
@@ -857,6 +863,22 @@ installMCARCH() {
# install -Dm644 "License.txt" "\$pkgdir/usr/share/licenses/\$pkgname/COPYING" # install -Dm644 "License.txt" "\$pkgdir/usr/share/licenses/\$pkgname/COPYING"
# } # }
# EOF # EOF
# pushd "$OUTPUTDIR/PKGBUILD" &>/dev/null || return
# makepkg_cmd="makepkg
# --syncdeps
# --clean
# --cleanbuild
# --force
# --install
# -p mediacenter.pkgbuild"
# if ! eval "${makepkg_cmd}"; then
# echo "makepkg failed"
# exit
# fi
# popd &>/dev/null || return
} }
@@ -1661,8 +1683,8 @@ main() {
if ! grep ^deb /etc/apt/sources.list|grep -q universe; then if ! grep ^deb /etc/apt/sources.list|grep -q universe; then
echo "Adding universe repository" echo "Adding universe repository"
declare add_universe_cmd="sudo add-apt-repository -y universe" declare add_universe_cmd="sudo add-apt-repository -y universe"
#debug "$add_universe_cmd" || add_universe_cmd+=" &>/dev/null" debug "$add_universe_cmd" || add_universe_cmd+=" &>/dev/null"
if ! exec "$add_universe_cmd"; then if ! eval "$add_universe_cmd"; then
err "Adding universe repository failed" err "Adding universe repository failed"
fi fi
fi fi
@@ -1700,7 +1722,7 @@ main() {
fi fi
fi fi
if (( BUILD_SWITCH )); then if (( BUILD_SWITCH )) && [[ $ID != "arch" ]]; then
installPackage "wget" installPackage "wget"
acquireDeb acquireDeb
if [[ "$TARGET" =~ (centos|fedora|suse) ]]; then if [[ "$TARGET" =~ (centos|fedora|suse) ]]; then