From f814f62267df068bd6f70f706876ac8acee5a79a Mon Sep 17 00:00:00 2001 From: Ivan Toriya <43750521+ivan-toriya@users.noreply.github.com> Date: Tue, 2 Apr 2024 17:07:55 +0300 Subject: [PATCH] fix(install): install script echo (#1899) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: install script echo * fix(nu): Update atuin.nu to resolve 0.92 deprecation (#1913) * feat(install): Update install.sh to support KDE Neon (#1908) KDE Neon is based on Ubuntu 22.04, but the OS List for Ubuntu-based distros does not have the string "neon". This commit adds it. * chore(deps): bump lukemathwalker/cargo-chef (#1901) Bumps lukemathwalker/cargo-chef from latest-rust-1.76.0-buster to latest-rust-1.77.0-buster. --- updated-dependencies: - dependency-name: lukemathwalker/cargo-chef dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): flake.lock: Update (#1910) Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28) → 'github:numtide/flake-utils/b1d9ab70662946ef0850d488da1c9019f3a9752a' (2024-03-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ebe6e807793e7c9cc59cf81225fdee1a03413811' (2024-02-29) → 'github:NixOS/nixpkgs/807c549feabce7eddbf259dbdcec9e0600a0660d' (2024-03-29) Co-authored-by: github-actions[bot] * fix(doctor): detect preexec plugin using env ATUIN_PREEXEC_BACKEND (#1856) * refactor(doctor): update func names and desc to match current impl * fix(doctor): use environment variable to detect plugin if possible In this patch, if the plugin provides an environment variable, we use the environment variable to test the existence of the plugin. When an environment variable is not available, we continue to use the mock interactive session by "shell -ic command". We also test shell-specific plugins only in the corresponding shells. An additional test can be performed by a custom function for each plugin. * chore(deps): bump sysinfo from 0.30.6 to 0.30.7 (#1888) Bumps [sysinfo](https://github.com/GuillaumeGomez/sysinfo) from 0.30.6 to 0.30.7. - [Changelog](https://github.com/GuillaumeGomez/sysinfo/blob/master/CHANGELOG.md) - [Commits](https://github.com/GuillaumeGomez/sysinfo/compare/v0.30.6...v0.30.7) --- updated-dependencies: - dependency-name: sysinfo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --------- Signed-off-by: dependabot[bot] Co-authored-by: Ivan Toriya Co-authored-by: Wind Co-authored-by: Diego Carrasco Gubernatis <557703+dacog@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] Co-authored-by: Koichi Murase --- install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 462109ed..7e39e0f8 100755 --- a/install.sh +++ b/install.sh @@ -71,9 +71,9 @@ __atuin_install_arch(){ } -__atuin_install_ubuntu(){ +__atuin_install_deb_based(){ if [ "$(dpkg --print-architecture)" = "amd64" ]; then - echo "Ubuntu detected" + echo "Detected distro: $OS" ARTIFACT_URL="https://github.com/atuinsh/atuin/releases/download/$LATEST_VERSION/atuin_${LATEST_VERSION//v/}_amd64.deb" TEMP_DEB="$(mktemp)".deb && curl -Lo "$TEMP_DEB" "$ARTIFACT_URL" @@ -84,7 +84,7 @@ __atuin_install_ubuntu(){ fi rm -f "$TEMP_DEB" else - echo "Ubuntu detected, but not amd64" + echo "$OS detected, but not amd64" __atuin_install_unsupported fi } @@ -104,7 +104,7 @@ __atuin_install_linux(){ "arch" | "manjarolinux" | "endeavouros") __atuin_install_arch;; "ubuntu" | "ubuntuwsl" | "debian" | "linuxmint" | "parrot" | "kali" | "elementary" | "pop" | "neon") - __atuin_install_ubuntu;; + __atuin_install_deb_based;; *) # TODO: download a binary or smth __atuin_install_unsupported;;