Просмотр исходного кода

fix shebangs, make rust and rust-apps scripts idempotent

chach 2 недель назад
Родитель
Сommit
d214ad39c9
7 измененных файлов с 17 добавлено и 15 удалено
  1. 1 1
      01-bashrc.d.sh
  2. 1 1
      01-docker.sh
  3. 7 5
      01-rust.sh
  4. 1 1
      02-helix.sh
  5. 1 1
      02-tmux.sh
  6. 1 1
      05-lsp-markdown.sh
  7. 5 5
      10-rust-apps.sh

+ 1 - 1
01-bashrc.d.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 set -e
 

+ 1 - 1
01-docker.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 set -e
 

+ 7 - 5
01-rust.sh

@@ -2,10 +2,12 @@
 
 set -e
 
-rm -rf "$HOME/.cargo"
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o /tmp/rustup.sh
-sh /tmp/rustup.sh -y
-rm /tmp/rustup.sh
+if command -v rustup &>/dev/null || [ -f "$HOME/.cargo/env" ]; then
+  rustup update
+else
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs -o /tmp/rustup.sh
+  sh /tmp/rustup.sh -y
+  rm /tmp/rustup.sh
+fi
 
 . "$HOME/.cargo/env"
-echo hint: source "$HOME/.cargo/env"

+ 1 - 1
02-helix.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 set -e
 DIR="$HOME/.local/src/helix"
 rm -rf "$DIR"

+ 1 - 1
02-tmux.sh

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 set -e
 

+ 1 - 1
05-lsp-markdown.sh

@@ -1,3 +1,3 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 cargo install --git 'https://github.com/feel-ix-343/markdown-oxide' markdown-oxide

+ 5 - 5
10-rust-apps.sh

@@ -4,19 +4,19 @@ set -e
 BASHRCD="$HOME"/.bashrc.d
 
 # ls replacement
-cargo install exa
+cargo install exa 2>/dev/null || cargo install --force exa
 echo "which exa >/dev/null && alias ls='exa'" > "$BASHRCD"/alias_exa.sh
 
 # cat replacement
-cargo install bat
+cargo install bat 2>/dev/null || cargo install --force bat
 echo "which bat >/dev/null && alias cat='bat'" > "$BASHRCD"/alias_bat.sh
 
 # find replacement
-cargo install fd-find
+cargo install fd-find 2>/dev/null || cargo install --force fd-find
 
 # grep replacement
-cargo install ripgrep --features 'pcre2'
+cargo install ripgrep --features 'pcre2' 2>/dev/null || cargo install --force ripgrep --features 'pcre2'
 
 # shell prompt replacement
-cargo +1.90 install starship
+cargo +1.90 install starship 2>/dev/null || cargo +1.90 install --force starship
 echo 'eval "$(starship init bash)"' > "$BASHRCD"/starship.sh