Fix NAV URL-s and update readme (#18)

* Fix NAV URL-s and update readme * Fix abevjava NAV url * Save abevjava with different filename * Fix build. * Fix cut error. Co-authored-by: Kerkovits Ágoston <[email protected]> Co-authored-by: Adam Reisinger <[email protected]>
Res42 · Mar 24, 2022 · 31ab909 · 31ab909
1 parent 426e97e
commit 31ab909
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/README.en.md b/README.en.md
@@ -4,7 +4,7 @@
 **Only as a last resort. First check if the form can be submitted with the [Online Nyomtatványkitöltő Alkalmazás](https://onya.nav.gov.hu/).**
 (Yes, the KATA form can be submitted there.)
 
-To determine if the form you would like to use is available to be submitted via the ONYA, look up the form at the [NAV website](https://nav.gov.hu/nav/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav):  
+To determine if the form you would like to use is available to be submitted via the ONYA, look up the form at the [NAV website](https://nav.gov.hu/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav):  
 * if the result shows a link in red that says "Online felületen is beküldhető" the form should be submitted via the [Online Nyomtatványkitöltő Alkalmazás](https://onya.nav.gov.hu/).  
     e.g.: ![form available at ONYA](https://user-images.githubusercontent.com/2495806/137081509-c4195714-f842-4e8c-8f92-da034d06e4f4.png)
 * if there is no such link the form can only be submitted via ÁNYK.  
@@ -37,7 +37,7 @@ Run the following command: `docker run -p 3390:3389 reisingeradam/anyk:latest` o
 Or if you have an `.xml` file to import into the ÁNYK: `docker run -p 3390:3389 -v "<absolute path to the xml file>:/root/<file name>" reisingeradam/anyk:latest-20kata`.
 With this the XML will be in the root home directory.
 
-Connect with a remote desktop app to `localhost:3990` (the port may be changed in the docker run command or in the docker-compose.yml).
+Connect with a remote desktop app to `localhost:3390` (the port may be changed in the docker run command or in the docker-compose.yml).
 
 User/password: `root`/`root`.
 

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 **Csak végső esetben. Előbb nézd meg, hogy az [Online Nyomtatványkitöltő Alkalmazás](https://onya.nav.gov.hu/)ban elérhető az adott nyomtatvány.**
 (Igen, a KATA bevallások elérhetőek.)
 
-Ha szeretnéd megnézni, hogy a nyomtatványod elérhető-e ONYA-n keresztül, keress rá a [NAV weboldalán](https://nav.gov.hu/nav/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav):  
+Ha szeretnéd megnézni, hogy a nyomtatványod elérhető-e ONYA-n keresztül, keress rá a [NAV weboldalán](https://nav.gov.hu/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav):  
 * ha a találat mellett látsz egy "Online felületen is beküldhető" piros színű linket, add be a [Online Nyomtatványkitöltő Alkalmazás](https://onya.nav.gov.hu/)-on.  
     pl.: ![ONYA-ban beküldhető nyomtatvány](https://user-images.githubusercontent.com/2495806/137081509-c4195714-f842-4e8c-8f92-da034d06e4f4.png)
 * ha nincs ilyen link, akkor marad az ÁNYK.  

diff --git a/anyk-19hipa/Dockerfile b/anyk-19hipa/Dockerfile
@@ -2,7 +2,7 @@ FROM reisingeradam/anyk:latest
 LABEL maintainer="Dezso Burjan"
 
 # Download and install 19HIPA plugin for ANYK         
-RUN wget https://www.nav.gov.hu/data/cms578457/NAV_19HIPA.jar -P ~ \
+RUN wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav/19HIPA/NAV_19HIPA -O ~/NAV_19HIPA.jar \
     # -s: silent (non-gui) install
     && java -jar ~/NAV_19HIPA.jar -s \
     && rm ~/NAV_19HIPA.jar
diff --git a/anyk-19kata/Dockerfile b/anyk-19kata/Dockerfile
@@ -2,7 +2,7 @@ FROM reisingeradam/anyk:latest
 LABEL maintainer="Adam Reisinger"
 
 # Download and install 19KATA plugin for ANYK
-RUN wget https://www.nav.gov.hu/data/cms489660/NAV_19KATA.jar -P ~ \
+RUN wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav/19KATA/NAV_19KATA -O ~/NAV_19KATA.jar \
     # -s: silent (non-gui) install
     && java -jar ~/NAV_19KATA.jar -s \
     && rm ~/NAV_19KATA.jar
diff --git a/anyk-20hipa/Dockerfile b/anyk-20hipa/Dockerfile
@@ -2,7 +2,7 @@ FROM reisingeradam/anyk:latest
 LABEL maintainer="Adam Reisinger"
 
 # Download and install 20HIPA plugin for ANYK
-RUN wget https://www.nav.gov.hu/data/cms508913/NAV_20HIPA.jar -P ~ \
+RUN wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav/20HIPA/NAV_20HIPA -O ~/NAV_20HIPA.jar \
     # -s: silent (non-gui) install
     && java -jar ~/NAV_20HIPA.jar -s \
     && rm ~/NAV_20HIPA.jar
diff --git a/anyk-20kata/Dockerfile b/anyk-20kata/Dockerfile
@@ -2,7 +2,7 @@ FROM reisingeradam/anyk:latest
 LABEL maintainer="Adam Reisinger"
 
 # Download and install 20KATA plugin for ANYK
-RUN wget https://www.nav.gov.hu/data/cms511172/NAV_20KATA.jar -P ~ \
+RUN wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav/20KATA/NAV_20KATA.jar -O ~/NAV_20KATA.jar \
     # -s: silent (non-gui) install
     && java -jar ~/NAV_20KATA.jar -s \
     && rm ~/NAV_20KATA.jar
diff --git a/anyk-21hipa/Dockerfile b/anyk-21hipa/Dockerfile
@@ -2,7 +2,7 @@ FROM reisingeradam/anyk:latest
 LABEL maintainer="Agoston Kerkovits"
 
 # Download and install 21HIPA plugin for ANYK
-RUN wget https://www.nav.gov.hu/data/cms539367/NAV_21HIPA.jar -P ~ \
+RUN wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav/21HIPA/NAV_21HIPA -O ~/NAV_21HIPA.jar \
     # -s: silent (non-gui) install
     && java -jar ~/NAV_21HIPA.jar -s \
     && rm ~/NAV_21HIPA.jar
diff --git a/anyk-igazol/Dockerfile b/anyk-igazol/Dockerfile
@@ -2,7 +2,7 @@ FROM reisingeradam/anyk:latest
 LABEL maintainer="Adam Reisinger"
 
 # Download and install IGAZOL plugin for ANYK
-RUN wget https://nav.gov.hu/data/cms276234/NAV_IGAZOL.jar -P ~ \
+RUN wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvanykitolto_programok_nav/igazol/NAV_igazol.jar -O ~/NAV_IGAZOL.jar \
     # -s: silent (non-gui) install
     && java -jar ~/NAV_IGAZOL.jar -s \
     && rm ~/NAV_IGAZOL.jar
diff --git a/anyk/Dockerfile b/anyk/Dockerfile
@@ -10,9 +10,11 @@ RUN echo "root:root" | chpasswd \
     # Create 'Desktop' folder so the ANYK installer can create a shortcut there
     && mkdir ~/Desktop \
     # Download and install ANYK
-    && wget https://www.nav.gov.hu/data/cms36637/abevjava_install.jar -P ~ \
+    && wget https://nav.gov.hu/pfile/programFile?path=/nyomtatvanyok/letoltesek/nyomtatvanykitolto_programok/nyomtatvany_apeh/keretprogramok/AbevJava -O ~/abevjava_install.jar \
     # -s: silent (non-gui) install
     # -u: create user settings
+    && ls -la \
+    && ls -la ~ \
     && java -jar ~/abevjava_install.jar -s -u \
     && rm ~/abevjava_install.jar
 
@@ -22,4 +24,4 @@ RUN chmod +x /usr/bin/hun-keyboard.sh
 
 # Overwrite entrypoint bash file: removed the user creation script there
 COPY ./files/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
-RUN chmod +x /usr/bin/docker-entrypoint.sh
+RUN chmod +x /usr/bin/docker-entrypoint.sh