ENGO150/WHY2
Template
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

fixed rustup installation

Browse Source
This commit is contained in:
Václav Šmejkal 2024-01-24 11:37:43 +01:00
parent 553d9732e8
commit 58d05293ce
Signed by: ENGO150
GPG Key ID: 4A57E86482968843
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure.sh
View File

@ -24,18 +24,14 @@ if [[ $(id -u) != "0" ]] && [[ $1 != "force" ]]; then
exit 1 exit 1
fi fi
COMMON="gcc make tmux" COMMON="gcc make tmux curl"
ARCH_GENTOO_COMMON="$COMMON json-c curl libgit2" ARCH_GENTOO_COMMON="$COMMON json-c libgit2"
# Get COMMAND # Get COMMAND
if [[ $DISTRO == "Arch" ]]; then if [[ $DISTRO == "Arch" ]]; then
COMMAND="pacman -S --needed --noconfirm $ARCH_GENTOO_COMMON libyaml rustup" COMMAND="pacman -S --needed --noconfirm $ARCH_GENTOO_COMMON libyaml"
COMMAND="$COMMAND && pacman -S --needed --noconfirm cargo"
elif [[ $DISTRO == "Ubuntu" ]] || [[ $DISTRO == "Debian" ]]; then elif [[ $DISTRO == "Ubuntu" ]] || [[ $DISTRO == "Debian" ]]; then
COMMAND="apt install -y $COMMON libjson-c-dev libcurl4-nss-dev libgit2-dev libyaml-dev rustup" COMMAND="apt install -y $COMMON libjson-c-dev libcurl4-nss-dev libgit2-dev libyaml-dev"
COMMAND="$COMMAND && apt install -y cargo"
elif [[ $DISTRO == "Gentoo" ]]; then elif [[ $DISTRO == "Gentoo" ]]; then
COMMAND="emerge -vn $ARCH_GENTOO_COMMON dev-libs/libyaml" COMMAND="emerge -vn $ARCH_GENTOO_COMMON dev-libs/libyaml"
@ -44,12 +40,6 @@ elif [[ $DISTRO == "Gentoo" ]]; then
echo "LDPATH=/usr/lib/libwhy2-logger.so" > /etc/env.d/99why2-logger echo "LDPATH=/usr/lib/libwhy2-logger.so" > /etc/env.d/99why2-logger
echo "LDPATH=/usr/lib/libwhy2-chat.so" > /etc/env.d/99why2-chat echo "LDPATH=/usr/lib/libwhy2-chat.so" > /etc/env.d/99why2-chat
env-update && source /etc/profile env-update && source /etc/profile
# Install Rust
if ! [ -x "$(command -v cargo)" ]; then
curl https://sh.rustup.rs -sSf | sh # Install Rust and components
source "$HOME/.cargo/env"
fi
else else
# 'Unsupported' distro # 'Unsupported' distro
echo "It seems you are using unsupported distribution... Don't worry, just install 'gcc', 'json-c', 'curl', 'libgit2', 'tmux', 'libyaml' and 'make' and you'll be fine." echo "It seems you are using unsupported distribution... Don't worry, just install 'gcc', 'json-c', 'curl', 'libgit2', 'tmux', 'libyaml' and 'make' and you'll be fine."
@ -59,5 +49,8 @@ fi
# Execute COMMAND # Execute COMMAND
$COMMAND $COMMAND
# Config Rust version # Install Rust
rustup default stable if ! [ -x "$(command -v cargo)" ]; then
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y # Install Rust and components
source "$HOME/.cargo/env"
fi