Use --install=local by default on arch
This commit is contained in:
25
installJRMC
25
installJRMC
@@ -289,25 +289,25 @@ init() {
|
|||||||
|
|
||||||
# Normalize ID and set host-specific vars
|
# Normalize ID and set host-specific vars
|
||||||
case $ID in
|
case $ID in
|
||||||
debian|arch|fedora|centos) ;;
|
debian|fedora|centos) ;;
|
||||||
rhel|almalinux) ID="centos" ;;
|
rhel|almalinux) ID="centos" ;;
|
||||||
linuxmint|neon|zorin|*ubuntu*) ID="ubuntu" ;;
|
linuxmint|neon|zorin|*ubuntu*) ID="ubuntu" ;;
|
||||||
raspbian) ID="debian" ;;
|
raspbian) ID="debian" ;;
|
||||||
manjaro) ID="arch" ;;
|
manjaro|arch) ID="arch"
|
||||||
*suse*)
|
|
||||||
ID="suse"
|
|
||||||
# Currently there is no remote repository for SUSE
|
|
||||||
# installJRMC can easily create one but I'd rather a SUSEian provide it
|
|
||||||
# So use local rpmbuild method by default for SUSE
|
|
||||||
if ((REPO_INSTALL_SWITCH)); then
|
if ((REPO_INSTALL_SWITCH)); then
|
||||||
debug "Automatically using --install=local for SUSE"
|
debug "Automatically using --install=local for SUSE"
|
||||||
REPO_INSTALL_SWITCH=0
|
REPO_INSTALL_SWITCH=0
|
||||||
BUILD_SWITCH=1
|
BUILD_SWITCH=1
|
||||||
LOCAL_INSTALL_SWITCH=1
|
LOCAL_INSTALL_SWITCH=1
|
||||||
fi
|
fi ;;
|
||||||
;;
|
*suse*) ID="suse"
|
||||||
*)
|
if ((REPO_INSTALL_SWITCH)); then
|
||||||
err "Auto-detecting distro, this is unreliable and --compat may be required"
|
debug "Automatically using --install=local for SUSE"
|
||||||
|
REPO_INSTALL_SWITCH=0
|
||||||
|
BUILD_SWITCH=1
|
||||||
|
LOCAL_INSTALL_SWITCH=1
|
||||||
|
fi ;;
|
||||||
|
*) err "Auto-detecting distro, this is unreliable and --compat may be required"
|
||||||
for cmd in dnf yum apt-get pacman; do
|
for cmd in dnf yum apt-get pacman; do
|
||||||
if command -v "$cmd" &>/dev/null; then
|
if command -v "$cmd" &>/dev/null; then
|
||||||
case "$cmd" in
|
case "$cmd" in
|
||||||
@@ -331,8 +331,7 @@ init() {
|
|||||||
else
|
else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi ;;
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Set distro-specific package manager commands for normalized IDs
|
# Set distro-specific package manager commands for normalized IDs
|
||||||
|
|||||||
Reference in New Issue
Block a user