|
@@ -131,7 +131,7 @@ execute() {
|
|
init() {
|
|
init() {
|
|
debug "Running: ${FUNCNAME[0]}"
|
|
debug "Running: ${FUNCNAME[0]}"
|
|
|
|
|
|
- declare -g ID RPM_MGR ARCH
|
|
|
|
|
|
+ declare -g ID RPM_MGR ARCH OS_NAME
|
|
declare -ga PKG_INSTALL PKG_REMOVE PKG_UPDATE PKG_QUERY
|
|
declare -ga PKG_INSTALL PKG_REMOVE PKG_UPDATE PKG_QUERY
|
|
|
|
|
|
echo "Starting installJRMC"
|
|
echo "Starting installJRMC"
|
|
@@ -147,6 +147,8 @@ init() {
|
|
exit 1
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
|
|
|
|
+ OS_NAME="${NAME// /_}"
|
|
|
|
+
|
|
# Detect architecture and translate to MC convention
|
|
# Detect architecture and translate to MC convention
|
|
ARCH=$(uname -m)
|
|
ARCH=$(uname -m)
|
|
case $ARCH in
|
|
case $ARCH in
|
|
@@ -1710,16 +1712,25 @@ main() {
|
|
install_package epel-release
|
|
install_package epel-release
|
|
fi
|
|
fi
|
|
if ! "${PKG_QUERY[@]}" rpmfusion-free-release &>/dev/null; then
|
|
if ! "${PKG_QUERY[@]}" rpmfusion-free-release &>/dev/null; then
|
|
|
|
+ echo "Installing the RPMFusion repository"
|
|
install_package --no-install-check \
|
|
install_package --no-install-check \
|
|
"https://download1.rpmfusion.org/free/el/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
|
|
"https://download1.rpmfusion.org/free/el/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
|
|
fi
|
|
fi
|
|
;;
|
|
;;
|
|
fedora)
|
|
fedora)
|
|
if ! "${PKG_QUERY[@]}" rpmfusion-free-release &>/dev/null; then
|
|
if ! "${PKG_QUERY[@]}" rpmfusion-free-release &>/dev/null; then
|
|
|
|
+ echo "Installing the RPMFusion repository"
|
|
install_package --no-install-check \
|
|
install_package --no-install-check \
|
|
"https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
|
|
"https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$VERSION_ID.noarch.rpm"
|
|
fi
|
|
fi
|
|
;;
|
|
;;
|
|
|
|
+ suse)
|
|
|
|
+ if ! zypper repos | grep -q "X11:XOrg"; then
|
|
|
|
+ echo "Installing the X11 repository"
|
|
|
|
+ execute sudo zypper --non-interactive --quiet addrepo \
|
|
|
|
+ "https://download.opensuse.org/repositories/X11:/XOrg/$OS_NAME/X11:XOrg.repo"
|
|
|
|
+ fi
|
|
|
|
+ ;;
|
|
esac
|
|
esac
|
|
|
|
|
|
if (( REPO_INSTALL_SWITCH )); then
|
|
if (( REPO_INSTALL_SWITCH )); then
|