Browse Source

Merge pull request #272 from YunoHost-Apps/fix-autoupdate

Name one of assets `main` to avoid autoupdate madness x_x
eric_G 1 year ago
parent
commit
74396535de
12 changed files with 13 additions and 13 deletions
  1. 1 1
      README.md
  2. 1 1
      README_es.md
  3. 1 1
      README_eu.md
  4. 1 1
      README_fr.md
  5. 1 1
      README_gl.md
  6. 1 1
      README_id.md
  7. 1 1
      README_nl.md
  8. 1 1
      README_ru.md
  9. 1 1
      README_zh_Hans.md
  10. 2 2
      manifest.toml
  11. 1 1
      scripts/install
  12. 1 1
      scripts/upgrade

+ 1 - 1
README.md

@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Shipped version:** 5.18.2~ynh1
+**Shipped version:** 5.18.3~ynh1
 
 
 ## Screenshots
 ## Screenshots
 
 

+ 1 - 1
README_es.md

@@ -18,7 +18,7 @@ No se debe editar a mano.
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Versión actual:** 5.18.2~ynh1
+**Versión actual:** 5.18.3~ynh1
 
 
 ## Capturas
 ## Capturas
 
 

+ 1 - 1
README_eu.md

@@ -18,7 +18,7 @@ EZ editatu eskuz.
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Paketatutako bertsioa:** 5.18.2~ynh1
+**Paketatutako bertsioa:** 5.18.3~ynh1
 
 
 ## Pantaila-argazkiak
 ## Pantaila-argazkiak
 
 

+ 1 - 1
README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Pi-hole® est un puits DNS qui protège vos appareils des contenus indésirables sans installer de logiciel côté client.
 Pi-hole® est un puits DNS qui protège vos appareils des contenus indésirables sans installer de logiciel côté client.
 
 
 
 
-**Version incluse :** 5.18.2~ynh1
+**Version incluse :** 5.18.3~ynh1
 
 
 ## Captures d’écran
 ## Captures d’écran
 
 

+ 1 - 1
README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Versión proporcionada:** 5.18.2~ynh1
+**Versión proporcionada:** 5.18.3~ynh1
 
 
 ## Capturas de pantalla
 ## Capturas de pantalla
 
 

+ 1 - 1
README_id.md

@@ -18,7 +18,7 @@ Ini TIDAK boleh diedit dengan tangan.
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Versi terkirim:** 5.18.2~ynh1
+**Versi terkirim:** 5.18.3~ynh1
 
 
 ## Tangkapan Layar
 ## Tangkapan Layar
 
 

+ 1 - 1
README_nl.md

@@ -18,7 +18,7 @@ Hij mag NIET handmatig aangepast worden.
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Geleverde versie:** 5.18.2~ynh1
+**Geleverde versie:** 5.18.3~ynh1
 
 
 ## Schermafdrukken
 ## Schermafdrukken
 
 

+ 1 - 1
README_ru.md

@@ -18,7 +18,7 @@
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**Поставляемая версия:** 5.18.2~ynh1
+**Поставляемая версия:** 5.18.3~ynh1
 
 
 ## Снимки экрана
 ## Снимки экрана
 
 

+ 1 - 1
README_zh_Hans.md

@@ -18,7 +18,7 @@
 
 
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 The Pi-hole® is a DNS sinkhole that protects your devices from unwanted content without installing any client-side software.
 
 
-**分发版本:** 5.18.2~ynh1
+**分发版本:** 5.18.3~ynh1
 
 
 ## 截图
 ## 截图
 
 

+ 2 - 2
manifest.toml

@@ -7,7 +7,7 @@ name = "Pi-hole"
 description.en = "Network-wide ad blocking via your own DNS server"
 description.en = "Network-wide ad blocking via your own DNS server"
 description.fr = "Filtrage publicitaire via votre propre serveur DNS"
 description.fr = "Filtrage publicitaire via votre propre serveur DNS"
 
 
-version = "5.18.2~ynh1"
+version = "5.18.3~ynh1"
 
 
 maintainers = []
 maintainers = []
 
 
@@ -54,7 +54,7 @@ ram.runtime = "200M"
 
 
 [resources]
 [resources]
     [resources.sources]
     [resources.sources]
-    [resources.sources.pi-hole_core]
+    [resources.sources.main]
     url = "https://github.com/pi-hole/pi-hole/archive/refs/tags/v5.18.3.tar.gz"
     url = "https://github.com/pi-hole/pi-hole/archive/refs/tags/v5.18.3.tar.gz"
     sha256 = "871b47b41813342484df8f10981801eba25f27c9cdbeafd6e71f0edbae6818e5"
     sha256 = "871b47b41813342484df8f10981801eba25f27c9cdbeafd6e71f0edbae6818e5"
 
 

+ 1 - 1
scripts/install

@@ -26,7 +26,7 @@ _configure_ports
 ynh_script_progression --message="Setting up source files..." --weight=4
 ynh_script_progression --message="Setting up source files..." --weight=4
 
 
 # Download, check integrity, uncompress and patch the source from app.src
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --source_id="pi-hole_core" --dest_dir="$PI_HOLE_LOCAL_REPO"
+ynh_setup_source --dest_dir="$PI_HOLE_LOCAL_REPO"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="$install_dir/ftl"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="$install_dir/ftl"
 
 

+ 1 - 1
scripts/upgrade

@@ -50,7 +50,7 @@ fi
 ynh_script_progression --message="Upgrading source files..." --weight=4
 ynh_script_progression --message="Upgrading source files..." --weight=4
 
 
 # Download, check integrity, uncompress and patch the source from app.src
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --source_id="pi-hole_core" --dest_dir="$PI_HOLE_LOCAL_REPO"
+ynh_setup_source --dest_dir="$PI_HOLE_LOCAL_REPO"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_web" --dest_dir="$install_dir/web"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="$install_dir/ftl"
 ynh_setup_source --source_id="pi-hole_ftl" --dest_dir="$install_dir/ftl"