Testing

Testing

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~ynh1
+**Shipped version:** v2023.12.1~ynh1
 
 ## Screenshots
 

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~ynh1
+**Version incluse :** v2023.12.1~ynh1
 
 ## Captures d’écran
 

conf/systemd.service

@@ -6,7 +6,7 @@ After=network.target
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__/
+WorkingDirectory=__INSTALL_DIR__/
 Environment="__YNH_NODE_LOAD_PATH__"
 Environment="NODE_ENV=production"
 ExecStart=__YNH_NPM__ start

manifest.toml

@@ -5,7 +5,7 @@ name = "Iceshrimp"
 description.en = "$app is a decentralized and federated social networking service, implementing the ActivityPub standard."
 description.fr = "$app est un service de réseau social décentralisé et fédéré, implémentant le standard ActivityPub."
 
-version = "v2023~ynh1"
+version = "v2023.12.1~ynh1"
 
 maintainers = ["oufmilo"]
 
@@ -15,7 +15,7 @@ website = "https://iceshrimp.dev"
 code = "https://iceshrimp.dev/iceshrimp/iceshrimp"
 
 [integration]
-yunohost = ">= 11.1.14"
+yunohost = ">= 11.2"
 architectures = "all" 
 multi_instance = false
 ldap = "not_relevant" 
@@ -26,21 +26,16 @@ ram.runtime = "2G"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
 
     [install.init_main_permission]
-    help.en = "If enabled, Firefish will be accessible by people who do not have an account. This can be changed later via the webadmin."
+    help.en = "If enabled, Iceshrimp will be accessible by people who do not have an account. This can be changed later via the webadmin."
-    help.fr = "Si cette case est cochée, Firefish sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
+    help.fr = "Si cette case est cochée, Iceshrimp sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
     type = "group"
     default = "visitors"
 
 [resources]
 
-    [resources.sources.main]
-    url = "https://iceshrimp.dev/iceshrimp/iceshrimp/archive/v2023.11.4.tar.gz"
-    sha256 = "e5918afc997f7b3513043ade77f0e3f5a222a724afd6742eed0b9128627a6712"
-
     [resources.system_user]
 
     [resources.install_dir]
@@ -52,7 +47,7 @@ ram.runtime = "2G"
     main.default = 3020
 
     [resources.apt]
-    packages = "ffmpeg, postgresql, build-essential"
+    packages = "ffmpeg, postgresql, build-essential, git, git-lfs"
 
     extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main"
     extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg"

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
+mkdir -p "$install_dir"
-ynh_setup_source --dest_dir="$install_dir"
-
 chown -R $app:www-data "$install_dir"
 
+git lfs install && git lfs pull
+
+# Download, check integrity, uncompress and patch the source from GitHub
+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
 #=================================================

scripts/restore

@@ -32,19 +32,17 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
 #=================================================
-# REINSTALL PNPM
+# REINSTALL YARN
 #=================================================
-ynh_script_progression --message="Reinstalling pnpm..." --weight=1
+ynh_script_progression --message="Reinstalling yarn..." --weight=1
 
-# Define and install pnpm
+# Define and install yarn
-pushd "$install_dir"
+pushd "$install_dir"	
-	curl https://sh.rustup.rs -sSf | ynh_exec_warn_less ynh_exec_as $app sh -s -- -y
-	export PATH="$install_dir/.cargo/bin:$PATH"	
 	ynh_use_nodejs
 	corepack enable
-	corepack prepare pnpm@latest --activate
+	corepack prepare --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build
 popd
 
 #=================================================

scripts/upgrade

@@ -58,17 +58,24 @@ 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
+then
-	ynh_setup_source --dest_dir="$install_dir" --keep=".config/default.yml"
+	ynh_script_progression --message="Upgrading source files..." --weight=5
+
+	pushd $install_dir
+		chown -R $app:www-data "$install_dir"
+		
+		ynh_exec_as $app git fetch
+    	#git checkout master
+    	ynh_exec_as $app git pull
+	popd
 fi
 
 chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
+
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================