diff --git a/manifest.toml b/manifest.toml index 4874e7e..4b233c3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Immich" description.en = "Photo and video backup solution directly from your mobile phone" description.fr = "Sauvegarde de photos et de vidéos directement depuis votre mobile" -version = "1.98.2~ynh1" +version = "1.100.0~ynh1" maintainers = ["ewilly"] @@ -42,8 +42,8 @@ ram.runtime = "500M" [resources.sources] [resources.sources.main] - url = "https://github.com/immich-app/immich/archive/refs/tags/v1.98.2.tar.gz" - sha256 = "3fd79057b41a235518dde50ce62a2314758329c20360f462f77bba949f35d306" + url = "https://github.com/immich-app/immich/archive/refs/tags/v1.100.0.tar.gz" + sha256 = "13f00122d97f75293d4b1ac3385d40ebf07278f3b14ac2c7898138d9cf446fbb" autoupdate.strategy = "latest_github_release" @@ -55,10 +55,12 @@ ram.runtime = "500M" [resources.sources.geonames_divisions] url = "https://download.geonames.org/export/dump/admin1CodesASCII.txt" sha256 = "6eace8b269cd4c9635d8f8631857c0be2cb3fb6362495f77f17f266ef7328f11" + rename = "admin1CodesASCII.txt" [resources.sources.geonames_subdivisions] url = "https://download.geonames.org/export/dump/admin2Codes.txt" sha256 = "defbd99329530fa6b06e154662fb16a51a0c12caf41636be17597c58c5374f1c" + rename = "admin2Codes.txt" [resources.ports] main.default = 3001 diff --git a/scripts/_common.sh b/scripts/_common.sh index 6d6a3aa..9b36bc4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -188,10 +188,12 @@ myynh_install_immich() { ynh_exec_warn_less "$ynh_npm" install sharp # Use 127.0.0.1 for microservices - sed -i -e "s@app.listen(port)@app.listen(port, '127.0.0.1')@g" "$install_dir/app/dist/microservices/main.js" + sed -i -e "s@app.listen(port)@app.listen(port, '127.0.0.1')@g" "$install_dir/app/dist/main.js" # Install geonames - cp -a "$source_dir/resources/*.txt" "$install_dir/resources/" + cp -a "$source_dir/geonames_cities/cities500.txt" "$install_dir/resources/" + cp -a "$source_dir/geonames_divisions/admin1CodesASCII.txt" "$install_dir/resources/" + cp -a "$source_dir/geonames_subdivisions/admin2Codes.txt" "$install_dir/resources/" date --iso-8601=seconds | tr -d "\n" > "$install_dir/resources/geodata-date.txt" # Cleanup diff --git a/scripts/install b/scripts/install index 74a5cd5..e6d06bc 100755 --- a/scripts/install +++ b/scripts/install @@ -15,9 +15,9 @@ ynh_script_progression --message="Setting up source files..." --weight=1 source_dir="$install_dir/source" ynh_setup_source --source_id="main" --dest_dir="$source_dir" -ynh_setup_source --source_id="geonames_cities" --dest_dir="$source_dir/resources/" -ynh_setup_source --source_id="geonames_divisions" --dest_dir="$source_dir/resources/" -ynh_setup_source --source_id="geonames_subdivisions" --dest_dir="$source_dir/resources/" +ynh_setup_source --source_id="geonames_cities" --dest_dir="$source_dir/geonames_cities/" +ynh_setup_source --source_id="geonames_divisions" --dest_dir="$source_dir/geonames_divisions/" +ynh_setup_source --source_id="geonames_subdivisions" --dest_dir="$source_dir/geonames_subdivisions/" #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED diff --git a/scripts/upgrade b/scripts/upgrade index 68763ab..33818a5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,9 +27,9 @@ ynh_script_progression --message="Upgrading source files..." --weight=1 source_dir="$install_dir/source" ynh_setup_source --source_id="main" --dest_dir="$source_dir" --full_replace=1 -ynh_setup_source --source_id="geonames_cities" --dest_dir="$source_dir/resources/" --full_replace=1 -ynh_setup_source --source_id="geonames_divisions" --dest_dir="$source_dir/resources/" --full_replace=1 -ynh_setup_source --source_id="geonames_subdivisions" --dest_dir="$source_dir/resources/" --full_replace=1 +ynh_setup_source --source_id="geonames_cities" --dest_dir="$source_dir/geonames_cities/" --full_replace=1 +ynh_setup_source --source_id="geonames_divisions" --dest_dir="$source_dir/geonames_divisions/" --full_replace=1 +ynh_setup_source --source_id="geonames_subdivisions" --dest_dir="$source_dir/geonames_subdivisions/" --full_replace=1 #================================================= # CHECK PYTHON VERSION AND COMPILE IF NEEDED