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

New generic install method

Browse Source
This commit is contained in:
Bryan Roessler
2023-03-21 14:09:40 -04:00
parent b41902ad13
commit d7e52af956
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
installJRMC
View File

@@ -157,7 +157,7 @@ parseInput() {
long_opts+="vncpass:,display:,container:,compat,arch:,yes" long_opts+="vncpass:,display:,container:,compat,arch:,yes"
short_opts="+i:vb::dhus:c:" short_opts="+i:vb::dhus:c:"
# Redeclare DEBUG and catch permanently with getopt # Reset DEBUG and catch with getopt
declare -g DEBUG=0 declare -g DEBUG=0
if input=$(getopt -o $short_opts -l $long_opts -- "$@"); then if input=$(getopt -o $short_opts -l $long_opts -- "$@"); then
@@ -501,6 +501,7 @@ installPackage() {
# Filter installed packages # Filter installed packages
for pkg in "$@"; do for pkg in "$@"; do
if [[ -v pkg_aliases[$pkg] ]]; then if [[ -v pkg_aliases[$pkg] ]]; then
debug "Aliasing $pkg to ${pkg_aliases[$pkg]}"
pkg=${pkg_aliases[$pkg]} pkg=${pkg_aliases[$pkg]}
fi fi
if (( no_install_check )) || if (( no_install_check )) ||
@@ -580,7 +581,7 @@ installMCFromRepo() {
# Install mesa-va-drivers-freeworld separately from the RPM using dnf swap # Install mesa-va-drivers-freeworld separately from the RPM using dnf swap
installMesa installMesa
if ! execute installPackage \ if ! installPackage \
--no-install-check \ --no-install-check \
--allow-downgrades \ --allow-downgrades \
--no-gpg-check \ --no-gpg-check \
@@ -611,13 +612,13 @@ acquireDeb() {
fi fi
if [[ -v BETAPASS ]] && if [[ -v BETAPASS ]] &&
echo "Checking beta repo for DEB package" && wget -q -O "$MCDEB" \ echo "Checking beta repo for DEB package" && execute wget -q -O "$MCDEB" \
"https://files.jriver.com/mediacenter/channels/v$MVERSION/beta/$BETAPASS/MediaCenter-$MCVERSION-${USER_ARCH:-$ARCH}.deb"; then "https://files.jriver.com/mediacenter/channels/v$MVERSION/beta/$BETAPASS/MediaCenter-$MCVERSION-${USER_ARCH:-$ARCH}.deb"; then
echo "Found!" echo "Found!"
elif echo "Checking latest repo for DEB package" && wget -q -O "$MCDEB" \ elif echo "Checking latest repo for DEB package" && execute wget -q -O "$MCDEB" \
"https://files.jriver.com/mediacenter/channels/v$MVERSION/latest/MediaCenter-$MCVERSION-${USER_ARCH:-$ARCH}.deb"; then "https://files.jriver.com/mediacenter/channels/v$MVERSION/latest/MediaCenter-$MCVERSION-${USER_ARCH:-$ARCH}.deb"; then
echo "Found!" echo "Found!"
elif echo "Checking test repo for DEB package" && wget -q -O "$MCDEB" \ elif echo "Checking test repo for DEB package" && execute wget -q -O "$MCDEB" \
"https://files.jriver.com/mediacenter/test/MediaCenter-$MCVERSION-${USER_ARCH:-$ARCH}.deb"; then "https://files.jriver.com/mediacenter/test/MediaCenter-$MCVERSION-${USER_ARCH:-$ARCH}.deb"; then
echo "Found!" echo "Found!"
else else
@@ -831,7 +832,7 @@ installMCDEB() {
rm -rf "$extract_dir" rm -rf "$extract_dir"
fi fi
execute installPackage \ installPackage \
--no-install-check \ --no-install-check \
--no-gpg-check \ --no-gpg-check \
--allow-downgrades \ --allow-downgrades \
@@ -858,6 +859,8 @@ installMCRPM() {
installMCGENERIC() { installMCGENERIC() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
declare -a raw_files
echo "Using raw installation method!" echo "Using raw installation method!"
declare extract_dir && extract_dir="$(mktemp -d)" declare extract_dir && extract_dir="$(mktemp -d)"
@@ -867,14 +870,18 @@ installMCGENERIC() {
echo "You must install the following dependencies manually:" echo "You must install the following dependencies manually:"
grep -i "Depends:" control grep -i "Depends:" control
tar xvf "data.tar.xz" tar xvf "data.tar.xz"
pushd data &>/dev/null || return # List of files to install
# Add list of files to log for uninstall raw_files=("$(find etc/ usr/ -mindepth 1 -type f)")
find . -mindepth 1 -type f >> "$SCRIPTDIR/.uninstall" # Output to log file
for f in "${raw_files[@]}"; do
echo "/$f" >> "$SCRIPTDIR/.uninstall"
done
# Manually install files # Manually install files
sudo cp -a ./etc/* /etc/ for f in "${raw_files[@]}"; do
sudo cp -a ./usr/* /usr/ sudo cp -a "$f" /
popd -1 &>/dev/null || return done
popd &>/dev/null || return popd &>/dev/null || return
execute rm -rf "$extract_dir"
return 0 return 0
} }