Merge branch 'dev'

Author: EndMove

CONTROL/changelog.txt

@@ -1,3 +1,8 @@
+Version: 1.16.0.r01
+- Update, installation script improvement.
+- Gitea 1.16.0 major release notes (https://github.com/go-gitea/gitea/releases/tag/v1.16.0).
+  |=> Security fixes, stability improvements, added features and much more...
+
 Version: 1.15.10.r01
 - Update, container running user and group.
 - Add, auto-migration system for users leaving iGi's old Gitea app for this one.

CONTROL/config.json

@@ -2,7 +2,7 @@
   "general":{
     "package":"gitea-docker",
     "name":"Gitea",
-    "version":"1.15.10.r01",
+    "version":"1.16.0.r01",
     "depends":[
       "docker-ce(>=20.10.2.r2)"
     ],

CONTROL/description-fr.txt

@@ -1,5 +1,5 @@
 Gitea est une solution Opensource d'hébergement de code léger et rapide écrite en Go. Elle est publiée sous la licence MIT.
-Version actuelle de Gitea : 1.15.10 - Fonctionne avec une connexion HTTPS.
+Version actuelle de Gitea : 1.16.0 - Fonctionne avec une connexion HTTPS.
 
 !!! NOUVEAU !!! : Supporte maintenant la migration de l'ancien iGi Gitea vers celui-ci.
 

CONTROL/description.txt

@@ -1,5 +1,5 @@
 Gitea is an Opensource solution for lightweight and fast code hosting written in Go. It is published under the MIT license.
-Gitea current version: 1.15.10 - Work with an HTTPS connection.
+Gitea current version: 1.16.0 - Work with an HTTPS connection.
 
 !!! NEW !!! : Now supports the migration from the old iGi Gitea to this one.
 

CONTROL/post-uninstall.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-echo "gitea-adm: --== post-uninstall ==--"
+echo "gitea-adm: --== post-uninstall ==--"
+
+exit 0

CONTROL/pre-install.sh

@@ -1,3 +1,5 @@
 #!/bin/sh
 
-echo "gitea-adm: --== pre-install ==--"
+echo "gitea-adm: --== pre-install ==--"
+
+exit 0

CONTROL/pre-uninstall.sh

@@ -5,6 +5,7 @@ echo "gitea-adm: --== pre-uninstall ==--"
 # Environment variables
 GITEA_VERSION=$(cat $APKG_PKG_DIR/gitea_version)
 GITEA_CONTAINER=$(docker container ls -a | grep Gitea | awk '{print $1}')
+GITEA_IMAGE=$(docker images | grep gitea/gitea | grep $GITEA_VERSION | awk '{print $3}')
 
 # Force shutdown of the container and delete it
 echo "gitea-adm: Stopping and removing container"
@@ -15,8 +16,6 @@ if [ -n "$GITEA_CONTAINER" ]; then
   docker rm -f "$GITEA_CONTAINER"
 fi
 
-
-GITEA_IMAGE=$(docker images | grep gitea/gitea | grep $GITEA_VERSION | awk '{print $3}')
 # REMOVE docker image on uninstalling & updating
 echo "gitea-adm: Removing docker image"
 echo "gitea-adm: Image ID: $GITEA_IMAGE"

CONTROL/start-stop.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Environment variables
+# Environment variable
 GITEA_CONTAINER=Gitea
 
 case "$1" in

README.md

@@ -1,6 +1,6 @@
 # gitea-adm
 
-__Gitea version__: _`1.15.10`_
+__Gitea version__: _`1.16.0`_
 
 ![GitHub license](https://img.shields.io/badge/license-GPL--3.0-%23fe7d37) ![GitHub last commit](https://img.shields.io/github/last-commit/EndMove/gitea-adm)
 
@@ -45,4 +45,4 @@ When an update is available you can do it directly from APP CENTRAL in ADM. If y
 
 ## An issue or a request ?
 
-You can report a problem, ask for help or make changes at any time by following this [link](https://github.com/EndMove/gitea-adm/issues/new). Remember that I am not the developer of Gitea but of Gitea-ADM.
+You can report a problem, ask for help or make changes at any time by following this [link](https://github.com/EndMove/gitea-adm/issues/new). Remember that I am not the developer of Gitea but of Gitea-ADM.

gitea_version

@@ -1 +1 @@
-1.15.10
+1.16.0