Compare commits
2 Commits
df0989887b
...
8c97500dd4
| Author | SHA1 | Date | |
|---|---|---|---|
| 8c97500dd4 | |||
| f79a58ca8c |
@@ -738,8 +738,7 @@ acquire_deb() {
|
|||||||
|
|
||||||
acquire_deb_new() {
|
acquire_deb_new() {
|
||||||
debug "${FUNCNAME[0]}()"
|
debug "${FUNCNAME[0]}()"
|
||||||
declare -g MC_DEB
|
declare -g MC_DEB MC_SOURCE
|
||||||
declare -g MC_SOURCE="https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/$fname"
|
|
||||||
local fname mnt
|
local fname mnt
|
||||||
|
|
||||||
[[ -d $OUTPUT_DIR/SOURCES ]] || execute mkdir -p "$OUTPUT_DIR/SOURCES"
|
[[ -d $OUTPUT_DIR/SOURCES ]] || execute mkdir -p "$OUTPUT_DIR/SOURCES"
|
||||||
@@ -766,14 +765,14 @@ acquire_deb_new() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Download the deb file using the containerized package manager
|
# Download the deb file using the containerized package manager
|
||||||
if ! (create_mc_apt_container "apt-get -t $MC_REPO download --allow-unauthenticated mediacenter$MC_MVERSION" &&
|
if ! { create_mc_apt_container "apt-get -t $MC_REPO download --allow-unauthenticated mediacenter$MC_MVERSION" &&
|
||||||
mnt="$(sudo buildah mount "$CNT")" &&
|
mnt="$(sudo buildah mount "$CNT")" &&
|
||||||
execute sudo find "$mnt" -maxdepth 1 -type f -name "*.deb" -exec cp {} "$MC_DEB" \; &&
|
execute sudo find "$mnt" -maxdepth 1 -type f -name "*.deb" -exec cp {} "$MC_DEB" \; &&
|
||||||
[[ -f $MC_DEB ]] &&
|
[[ -f $MC_DEB ]] &&
|
||||||
execute sudo chown "$USER:$USER" "$MC_DEB" &&
|
execute sudo chown "$USER:$USER" "$MC_DEB" &&
|
||||||
execute sudo buildah umount "$CNT" &&
|
execute sudo buildah umount "$CNT" &&
|
||||||
execute sudo buildah rm "$CNT" &&
|
execute sudo buildah rm "$CNT" &&
|
||||||
MC_SOURCE="https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/$fname"); then
|
MC_SOURCE="https://files.jriver-cdn.com/mediacenter/channels/v$MC_MVERSION/latest/$fname"; }; then
|
||||||
err "Failed to download DEB from containerized package manager"
|
err "Failed to download DEB from containerized package manager"
|
||||||
echo "Using legacy download method"
|
echo "Using legacy download method"
|
||||||
# Define the repository search order
|
# Define the repository search order
|
||||||
|
|||||||
Reference in New Issue
Block a user