YunoHost-Apps/veloren_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/veloren_ynh.git synced 2024-09-03 17:46:10 +02:00
Code Issues Activity Actions

Fix upgrade

Browse source
This commit is contained in:
yalh76 2022-07-26 04:28:02 +02:00
parent 5be9cd21d5
commit 8938e76629
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/_common.sh
View file

@ -76,20 +76,24 @@ function set_permissions {
} }
function install_rust { function install_rust {
ynh_secure_remove --file="$final_path/.cargo"
ynh_secure_remove --file="$final_path/.rustup"
ynh_secure_remove --file="$data_path/.cargo" ynh_secure_remove --file="$data_path/.cargo"
ynh_secure_remove --file="$data_path/.rustup" ynh_secure_remove --file="$data_path/.rustup"
ynh_exec_warn_less ynh_exec_as "$app" RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain stable' ynh_exec_warn_less ynh_exec_as "$app" bash -c '
curl https://sh.rustup.rs -sSf | sh -s -- -q -y
source ~/.cargo/env
rustup toolchain install $(cat "'"$final_path/build/rust-toolchain"'")
'
} }
function compile_server { function compile_server {
install_rust install_rust
chown -R $app:$app "$final_path" chown -R $app:$app "$final_path"
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
pushd "$final_path/build" pushd "$final_path/build"
ynh_exec_warn_less ynh_exec_as "$app" env PATH="$PATH" NIX_GIT_HASH="$nix_git_hash" NIX_GIT_TAG="v$(ynh_app_upstream_version)" VELOREN_ASSETS="$final_path/build/assets" RUSTFLAGS="-D warnings" VELOREN_USERDATA_STRATEGY=system cargo build --bin veloren-server-cli --release ynh_exec_warn_less ynh_exec_as "$app" bash -c "
source ~/.cargo/env
NIX_GIT_HASH=\"$nix_git_hash\" NIX_GIT_TAG=\"v$(ynh_app_upstream_version)\" VELOREN_ASSETS=\"$final_path/build/assets\" RUSTFLAGS=\"-D warnings\" VELOREN_USERDATA_STRATEGY=system cargo build --bin veloren-server-cli --release
"
popd popd
ynh_secure_remove --file="$final_path/live" ynh_secure_remove --file="$final_path/live"
@ -101,8 +105,8 @@ function compile_server {
# Remove build files and rustup # Remove build files and rustup
ynh_secure_remove --file="$final_path/build" ynh_secure_remove --file="$final_path/build"
ynh_secure_remove --file="$final_path/.cargo" ynh_secure_remove --file="$data_path/.cargo"
ynh_secure_remove --file="$final_path/.rustup" ynh_secure_remove --file="$data_path/.rustup"
ynh_secure_remove --file="$data_path/assets" ynh_secure_remove --file="$data_path/assets"
ynh_exec_as $app ln -sf "$final_path/live/assets" "$data_path/assets" ynh_exec_as $app ln -sf "$final_path/live/assets" "$data_path/assets"