mirror of
https://github.com/ChrisTitusTech/linutil.git
synced 2024-11-21 21:09:42 +00:00
fix(fedora): Recent syntax changes with DNF5 (#907)
* Dnf5 fixes * again fix :) * final fix * added version check * Apply suggestions from code review Co-authored-by: Jeevitha Kannan K S <ksjeevithakannan123@gmail.com> * Update core/tabs/applications-setup/Developer-tools/sublime-setup.sh Co-authored-by: Jeevitha Kannan K S <ksjeevithakannan123@gmail.com> --------- Co-authored-by: Jeevitha Kannan K S <ksjeevithakannan123@gmail.com>
This commit is contained in:
parent
da5fb7a511
commit
f400eee4b1
|
@ -23,7 +23,12 @@ installSublime() {
|
||||||
;;
|
;;
|
||||||
dnf)
|
dnf)
|
||||||
"$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
|
"$ESCALATION_TOOL" rpm -v --import https://download.sublimetext.com/sublimehq-rpm-pub.gpg
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.sublimetext.com/rpm/stable/x86_64/sublime-text.repo
|
dnf_version=$(dnf --version | head -n 1 | cut -d '.' -f 1)
|
||||||
|
if [ "$dnf_version" -eq 4 ]; then
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.sublimetext.com/rpm/dev/x86_64/sublime-text.repo
|
||||||
|
else
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager addrepo --from-repofile=https://download.sublimetext.com/rpm/dev/x86_64/sublime-text.repo
|
||||||
|
fi
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
|
"$ESCALATION_TOOL" "$PACKAGER" install -y sublime-text
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
|
@ -25,7 +25,12 @@ installBrave() {
|
||||||
;;
|
;;
|
||||||
dnf)
|
dnf)
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
|
"$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
|
dnf_version=$(dnf --version | head -n 1 | cut -d '.' -f 1)
|
||||||
|
if [ "$dnf_version" -eq 4 ]; then
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
|
||||||
|
else
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager addrepo --from-repofile=https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
|
||||||
|
fi
|
||||||
"$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
|
"$ESCALATION_TOOL" rpm --import https://brave-browser-rpm-release.s3.brave.com/brave-core.asc
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
|
"$ESCALATION_TOOL" "$PACKAGER" install -y brave-browser
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -15,7 +15,12 @@ installVivaldi() {
|
||||||
;;
|
;;
|
||||||
dnf)
|
dnf)
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
|
"$ESCALATION_TOOL" "$PACKAGER" install -y dnf-plugins-core
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://repo.vivaldi.com/stable/vivaldi-fedora.repo
|
dnf_version=$(dnf --version | head -n 1 | cut -d '.' -f 1)
|
||||||
|
if [ "$dnf_version" -eq 4 ]; then
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://repo.vivaldi.com/stable/vivaldi-fedora.repo
|
||||||
|
else
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager addrepo --from-repofile=https://repo.vivaldi.com/stable/vivaldi-fedora.repo
|
||||||
|
fi
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y vivaldi-stable
|
"$ESCALATION_TOOL" "$PACKAGER" install -y vivaldi-stable
|
||||||
;;
|
;;
|
||||||
zypper)
|
zypper)
|
||||||
|
|
|
@ -28,7 +28,12 @@ install_docker() {
|
||||||
;;
|
;;
|
||||||
dnf)
|
dnf)
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core
|
"$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
|
dnf_version=$(dnf --version | head -n 1 | cut -d '.' -f 1)
|
||||||
|
if [ "$dnf_version" -eq 4 ]; then
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
|
||||||
|
else
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo
|
||||||
|
fi
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
|
"$ESCALATION_TOOL" "$PACKAGER" -y install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
|
||||||
"$ESCALATION_TOOL" systemctl enable --now docker
|
"$ESCALATION_TOOL" systemctl enable --now docker
|
||||||
;;
|
;;
|
||||||
|
@ -58,7 +63,12 @@ install_docker_compose() {
|
||||||
;;
|
;;
|
||||||
dnf)
|
dnf)
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core
|
"$ESCALATION_TOOL" "$PACKAGER" -y install dnf-plugins-core
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
|
dnf_version=$(dnf --version | head -n 1 | cut -d '.' -f 1)
|
||||||
|
if [ "$dnf_version" -eq 4 ]; then
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
|
||||||
|
else
|
||||||
|
"$ESCALATION_TOOL" "$PACKAGER" config-manager addrepo --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo
|
||||||
|
fi
|
||||||
"$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose-plugin
|
"$ESCALATION_TOOL" "$PACKAGER" install -y docker-compose-plugin
|
||||||
;;
|
;;
|
||||||
zypper)
|
zypper)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user