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

Fix --repo implementation

Browse Source
This commit is contained in:
Bryan Roessler
2024-05-28 16:14:18 -04:00
parent d86247ab53
commit ce0edfe1d0
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -26,8 +26,8 @@ $ installJRMC --help
Build or install a specific MC version, ex. "32.0.45" (default: latest version) Build or install a specific MC version, ex. "32.0.45" (default: latest version)
--arch ARCH --arch ARCH
Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture) Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
--base DEBIAN_BASE --base BASE_REPO
Specify the MC debian base, ex. "bullseye", "bookworm", "noble", etc (default: latest official) Specify the MC base repo, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
--outputdir PATH --outputdir PATH
Generate rpmbuild output in this PATH (default: ./output) Generate rpmbuild output in this PATH (default: ./output)
--restorefile RESTOREFILE --restorefile RESTOREFILE

18
installJRMC
View File

@@ -18,7 +18,7 @@ shopt -s extglob
declare -g SCRIPTVERSION="1.0-dev" declare -g SCRIPTVERSION="1.0-dev"
declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,83.0.html" # MC32 declare -g BOARDURL="https://yabb.jriver.com/interact/index.php/board,83.0.html" # MC32
declare -g DEBIANBASE="bullseye" declare -g BASE_REPO="bullseye"
declare -g MC_VERSION_HARDCODE="32.0.45" # Do find all replace declare -g MC_VERSION_HARDCODE="32.0.45" # Do find all replace
printHelp() { printHelp() {
@@ -43,8 +43,8 @@ printHelp() {
Specify the MC version, ex. "$MC_VERSION_HARDCODE" (default: latest version) Specify the MC version, ex. "$MC_VERSION_HARDCODE" (default: latest version)
--arch VERSION --arch VERSION
Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture) Specify the MC architecture, ex. "amd64", "arm64", etc (default: host architecture)
--base DEBIAN_BASE --base BASE_REPO
Specify the MC debian base, ex. "bullseye", "bookworm", "noble", etc (default: latest official) Specify the MC base repo, ex. "bullseye", "bookworm", "noble", etc (default: latest official)
--outputdir PATH --outputdir PATH
Generate rpmbuild output in this directory (default: ./output) Generate rpmbuild output in this directory (default: ./output)
--restorefile RESTOREFILE --restorefile RESTOREFILE
@@ -178,7 +178,7 @@ init() {
ID="ubuntu" ID="ubuntu"
if [[ ${VERSION_ID%.*} -ge 24 ]]; then if [[ ${VERSION_ID%.*} -ge 24 ]]; then
debug "Switching to noble repo for *buntu 24" debug "Switching to noble repo for *buntu 24"
declare -g DEBIANBASE='noble' declare -g BASE_REPO='noble'
fi fi
;; ;;
*suse*) *suse*)
@@ -328,7 +328,7 @@ parseInput() {
shift && USER_ARCH="$1" shift && USER_ARCH="$1"
;; ;;
--base) --base)
shift && declare -g DEBIANBASE="$1" shift && declare -g BASE_REPO="$1"
;; ;;
--restorefile) --restorefile)
shift && RESTOREFILE="$1" shift && RESTOREFILE="$1"
@@ -402,7 +402,7 @@ parseInput() {
####################################### #######################################
# Uses several methods to determine the latest JRiver MC version # Uses several methods to determine the latest JRiver MC version
# TODO but how to determine build distro `$DEBIANBASE=bullseye`? # TODO but how to determine build distro `$BASE_REPO=bullseye`?
####################################### #######################################
setMCVersion() { setMCVersion() {
debug "Running: ${FUNCNAME[0]}" debug "Running: ${FUNCNAME[0]}"
@@ -420,9 +420,9 @@ setMCVersion() {
echo "Determining latest MC version" echo "Determining latest MC version"
if installPackage --silent buildah && if installPackage --silent buildah &&
hash buildah &>/dev/null && hash buildah &>/dev/null &&
cnt=$(buildah from --quiet debian:"$DEBIANBASE"-slim) &>/dev/null && cnt=$(buildah from --quiet debian:"${BASE_REPO/noble/bullseye}"-slim) &>/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/ $DEBIANBASE main' > /etc/apt/sources.list 2>&1" &>/dev/null && "echo 'deb [trusted=no arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $BASE_REPO main' > /etc/apt/sources.list 2>&1" &>/dev/null &&
buildah run "$cnt" -- bash -c \ buildah run "$cnt" -- bash -c \
"apt update --allow-insecure-repositories &>/dev/null" &>/dev/null && "apt update --allow-insecure-repositories &>/dev/null" &>/dev/null &&
MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null && MC_VERSION=$(buildah run "$cnt" -- apt-cache policy mediacenter?? | grep Candidate | awk '{print $2}' | sort -V | tail -n1) &>/dev/null &&
@@ -627,7 +627,7 @@ installMCFromRepo() {
execute sudo rm -rf "$repo_dir"/mediacenter*.list execute sudo rm -rf "$repo_dir"/mediacenter*.list
installPackage wget installPackage wget
sudo bash -c "cat <<-EOF > $repo_dir/jriver.list sudo bash -c "cat <<-EOF > $repo_dir/jriver.list
deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $DEBIANBASE main deb [trusted=yes arch=amd64,i386,armhf,arm64] http://dist.jriver.com/latest/mediacenter/ $BASE_REPO main
EOF" EOF"
wget -qO- "http://dist.jriver.com/mediacenter@jriver.com.gpg.key" | wget -qO- "http://dist.jriver.com/mediacenter@jriver.com.gpg.key" |
sudo tee /etc/apt/trusted.gpg.d/jriver.asc &>/dev/null sudo tee /etc/apt/trusted.gpg.d/jriver.asc &>/dev/null