Fix version compare logic

.travis/test-entrypoint.sh

@@ -3,9 +3,10 @@ set -eu
 
 # copy of see .docker-files/entrypoint.sh - testing all versions
 version_greater() {
-	[ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2  | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+	[ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
+
 if ! version_greater "2019.06" "2019.06-rc"; then
 	exit 1;
 fi
@@ -33,3 +34,18 @@ fi
 if ! version_greater "2019.05" "2019.05-dev"; then
 	exit 1;
 fi
+if ! version_greater "2020.07-1" "2020.07"; then
+  exit 1;
+fi
+if ! version_greater "2020.07-2" "2020.07-1"; then
+  exit 1;
+fi
+if ! version_greater "2020.07-1" "2020.07-dev"; then
+  exit 1;
+fi
+if ! version_greater "2020.09-rc" "2020.09-dev"; then
+	exit 1
+fi
+if version_greater "2020.06-rc" "2020.09-dev"; then
+	exit 1;
+fi

2020.07-1/apache/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.07-1/fpm-alpine/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.07-1/fpm/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.07/apache/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.07/fpm-alpine/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.07/fpm/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.09-dev/apache/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.09-dev/fpm-alpine/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.09-dev/fpm/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.09-rc/apache/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.09-rc/fpm-alpine/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

2020.09-rc/fpm/entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]

docker-entrypoint.sh

@@ -13,7 +13,7 @@ run_as() {
 
 # checks if the the first parameter is greater than the second parameter
 version_greater() {
-  [ "$(printf '%s\n' "$@" | sort -r -t '-' -k2,2 | sort -t '.' -n -k1,1 -k2,2 -s | head -n 1)" != "$1" ]
+  [ "$(printf '%s\n' "$@" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/' | sort -t '.' -k1,1n -k2,2n -k3,3nbr | head -n 1)" != "$(printf "$1" | sed -e 's/-rc/.1/' | sed -e 's/-dev/.2/')" ]
 }
 
 # usage: file_env VAR [DEFAULT]