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

Fix tar commands

Browse Source
This commit is contained in:
Bryan Roessler
2023-03-24 13:38:26 -04:00
parent 01fedbcc6d
commit 7197c00ee6
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
installJRMC
View File

@@ -633,9 +633,6 @@ acquireDeb() {
debug "MCDEB=$MCDEB" debug "MCDEB=$MCDEB"
# If necessary, create SOURCES dir
[[ -d $OUTPUTDIR/SOURCES ]] || execute mkdir -p "$OUTPUTDIR/SOURCES"
# If deb file already exists, skip download # If deb file already exists, skip download
if [[ -f $MCDEB ]]; then if [[ -f $MCDEB ]]; then
echo "Using existing DEB: $MCDEB" echo "Using existing DEB: $MCDEB"
@@ -681,8 +678,6 @@ buildRPM() {
return 0 return 0
fi fi
[[ -d $OUTPUTDIR/SPECS ]] || mkdir -p "$OUTPUTDIR/SPECS"
# Load deb dependencies into array # Load deb dependencies into array
IFS=',' read -ra requires <<< "$(dpkg-deb -f "$MCDEB" Depends)" IFS=',' read -ra requires <<< "$(dpkg-deb -f "$MCDEB" Depends)"
IFS=',' read -ra recommends <<< "$(dpkg-deb -f "$MCDEB" Recommends)" IFS=',' read -ra recommends <<< "$(dpkg-deb -f "$MCDEB" Recommends)"
@@ -850,7 +845,7 @@ installMCDEB() {
declare extract_dir && extract_dir="$(mktemp -d)" declare extract_dir && extract_dir="$(mktemp -d)"
pushd "$extract_dir" &>/dev/null || return pushd "$extract_dir" &>/dev/null || return
execute ar x "$MCDEB" execute ar x "$MCDEB"
execute tar -xJf "control.tar.xz" execute tar xJf "control.tar.xz"
# Remove minimum version specifiers from control file # Remove minimum version specifiers from control file
sed -i 's/ ([^)]*)//g' "control" sed -i 's/ ([^)]*)//g' "control"
sed -i 's/([^)]*)//g' "control" # TODO MC DEB package error sed -i 's/([^)]*)//g' "control" # TODO MC DEB package error
@@ -896,11 +891,11 @@ installMCGENERIC() {
declare extract_dir && extract_dir="$(mktemp -d)" declare extract_dir && extract_dir="$(mktemp -d)"
pushd "$extract_dir" &>/dev/null || return pushd "$extract_dir" &>/dev/null || return
ar x "$MCDEB" &>/dev/null execute ar x "$MCDEB"
tar xvf "control.tar.xz" &>/dev/null execute tar xJf "control.tar.xz"
echo "You must install the following dependencies manually:" echo "You must install the following dependencies manually:"
grep -i "Depends:" control grep -i "Depends:" control
readarray -t raw_files < <(tar xvf data.tar.xz) readarray -t raw_files < <(tar xJvf data.tar.xz)
# Output to log file # Output to log file
for f in "${raw_files[@]/#./}"; do for f in "${raw_files[@]/#./}"; do
echo "$f" >> "$SCRIPTDIR/.uninstall" echo "$f" >> "$SCRIPTDIR/.uninstall"
@@ -1665,7 +1660,7 @@ uninstall() {
if [[ -f $SCRIPTDIR/.uninstall ]]; then if [[ -f $SCRIPTDIR/.uninstall ]]; then
echo "Removing files from .uninstall log" echo "Removing files from .uninstall log"
while read -r p; do while read -r p; do
[[ -d $p ]] && sudo rm -rf "$p" [[ -d $p ]] && execute sudo rm -rf "$p"
done < "$SCRIPTDIR/.uninstall" done < "$SCRIPTDIR/.uninstall"
mv "$SCRIPTDIR/.uninstall" "$SCRIPTDIR/.uninstall.bk" mv "$SCRIPTDIR/.uninstall" "$SCRIPTDIR/.uninstall.bk"
fi fi
@@ -1750,9 +1745,11 @@ main() {
if (( BUILD_SWITCH )) && [[ $ID != "arch" ]]; then if (( BUILD_SWITCH )) && [[ $ID != "arch" ]]; then
installPackage "wget" installPackage "wget"
[[ -d $OUTPUTDIR/SOURCES ]] || execute mkdir -p "$OUTPUTDIR/SOURCES"
acquireDeb acquireDeb
if [[ $BUILD_TARGET =~ (centos|fedora|suse) ]]; then if [[ $BUILD_TARGET =~ (centos|fedora|suse) ]]; then
installPackage "dpkg" "rpm-build" installPackage "dpkg" "rpm-build"
[[ -d $OUTPUTDIR/SPECS ]] || mkdir -p "$OUTPUTDIR/SPECS"
buildRPM buildRPM
fi fi
fi fi
@@ -1786,10 +1783,13 @@ main() {
if [[ $? -eq 127 ]]; then if [[ $? -eq 127 ]]; then
err "Service $service does not exist, check service name" err "Service $service does not exist, check service name"
else else
err "Failed to create service: $service" err "Failed to create $service service"
fi fi
else
echo "Started and enabled $service service"
fi fi
done done
unset service
fi fi
# for _container in "${CONTAINERS[@]}"; do # for _container in "${CONTAINERS[@]}"; do