diff --git a/README.md b/README.md index 03da024..75fd18b 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Iceshrimp is a decentralized and federated social networking service, implementi It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features. -**Shipped version:** v2023.12.1~ynh1 +**Shipped version:** 2023~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 3b9e204..48dda49 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,7 +20,7 @@ Iceshrimp est un service de réseau social décentralisé et fédéré, impléme Il a été forké de Calckey et Firefish (lui-même forké de Misskey) à la mi-2023, afin de se concentrer sur la stabilité, les performances et la facilité d'utilisation plutôt que sur de nouvelles fonctionnalités. -**Version incluse :** v2023.12.1~ynh1 +**Version incluse :** 2023~ynh1 ## Captures d’écran diff --git a/conf/systemd.service b/conf/systemd.service index 5ca7df6..08d2ee8 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -1,5 +1,5 @@ [Unit] -Description=Iceshrimp: microblogging platform +Description=Iceschrimp: microblogging platform After=network.target [Service] diff --git a/manifest.toml b/manifest.toml index f8d17b9..aad6414 100644 --- a/manifest.toml +++ b/manifest.toml @@ -36,10 +36,6 @@ ram.runtime = "2G" [resources] - [resources.sources.main] - url = "https://iceshrimp.dev/iceshrimp/iceshrimp/archive/v2023.12.1.tar.gz" - sha256 = "b5f3a48e769b1b4ebdb19ec1d22a1a08472953d024337b4c5ae40c3a3a91b49c" - [resources.system_user] [resources.install_dir] diff --git a/scripts/install b/scripts/install index 08e3589..4acca31 100755 --- a/scripts/install +++ b/scripts/install @@ -31,11 +31,18 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= ynh_script_progression --message="Setting up source files..." --weight=3 -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" - +mkdir -p "$install_dir" chown -R $app:www-data "$install_dir" +ynh_exec_warn_less git lfs install && git lfs pull + +# Download, check integrity, uncompress and patch the source from GitHub +ynh_exec_warn_less git clone https://iceshrimp.dev/iceshrimp/iceshrimp.git "$install_dir" --quiet + +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" + + #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index d90f523..44fe77f 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -58,11 +58,17 @@ fi #================================================= if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".config/default.yml" +then + ynh_script_progression --message="Upgrading source files..." --weight=5 + + pushd $install_dir + chown -R $app:www-data "$install_dir" + + ynh_exec_warn_less ynh_exec_as $app git fetch + #git checkout master + ynh_exec_warn_less ynh_exec_as $app git pull + popd fi chmod 750 "$install_dir"