[playonlinux] 116/230: New upstream version 4.0.6

[Bertrand Marc]

This is an automated email from the git hooks/post-receive script.

bmarc pushed a commit to branch master
in repository playonlinux.

commit 2a41441aafae4aa73dbf075da4baf28315382a87
Author: Bertrand Marc <bmarc at debian.org>
Date:   Sun Jul 9 19:16:32 2017 +0200

    New upstream version 4.0.6
---
 bash/run_exe            | 2 +-
 lib/debug.lib           | 8 ++++----
 lib/scripts.lib         | 3 +--
 playonlinux-bash        | 1 +
 playonlinux-pkg         | 1 +
 playonlinux-url_handler | 1 +
 python/lib/Variables.py | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/bash/run_exe b/bash/run_exe
index f6e4fb2..9b011ff 100755
--- a/bash/run_exe
+++ b/bash/run_exe
@@ -86,7 +86,7 @@ md5sreplace=$(cat $md5scripts | grep $md5 | sed s/" $md5"/""/)
 
 if [ ! "$(cat $md5scripts | grep $md5)" = "" ] # Le programme est connu, on propose le bon script
 then
-		POL_SetupWindow_question "$(eval_gettext "We have detected that the program you want to install is :")\n\n$md5sreplace\n\n$(eval_gettext "Do you want $APPLICATION_TITLE to install it automatically for you ?")" "$TITRE"
+		POL_SetupWindow_question "$(eval_gettext "We have detected that the program you want to install is :")\n\n$md5sreplace\n\n$(eval_gettext 'Do you want $APPLICATION_TITLE to install it automatically for you?')" "$TITRE"
 		if [ "$APP_ANSWER" = "TRUE" ]
 		then
 			POL_SetupWindow_Close
diff --git a/lib/debug.lib b/lib/debug.lib
index db5f451..e8d2355 100755
--- a/lib/debug.lib
+++ b/lib/debug.lib
@@ -88,7 +88,7 @@ POL_Debug_Message()
 	# Usage : POL_Debug_Message [MESSAGE]
 	
 	echo "$(Get_CurrentDate) - [${FUNCNAME[1]}] Message: $1" >> "$LOGFILE"
-	echo "[${FUNCNAME[1]}] Message: $1"
+	echo "[${FUNCNAME[1]}] Message: $1" 1>&2
 }
 POL_Debug_Warning()
 {
@@ -96,7 +96,7 @@ POL_Debug_Warning()
 	# Usage : POL_Debug_Warning [MESSAGE]
 	
 	echo "$(Get_CurrentDate) - [${FUNCNAME[1]}] Warning: $1" >> "$LOGFILE"
-	echo "[${FUNCNAME[1]}] Warning: $1"
+	echo "[${FUNCNAME[1]}] Warning: $1" 1>&2
 }
 POL_Debug_Error()
 {
@@ -105,7 +105,7 @@ POL_Debug_Error()
 	# Usage : POL_Debug_Error [MESSAGE]
 	
 	echo "$(Get_CurrentDate) - [${FUNCNAME[1]}] Error: $1" >> "$LOGFILE"
-	echo "[${FUNCNAME[1]}] Error: $1"
+	echo "[${FUNCNAME[1]}] Error: $1" 1>&2
 	POL_SetupWindow_message "Error: $1" "$TITLE" # La on affiche quand même 
 	export POL_SCRIPT_FAILED="YES"
 }
@@ -116,7 +116,7 @@ POL_Debug_Fatal()
 	# Usage : POL_Debug_Fatal [MESSAGE]
 	
 	echo "$(Get_CurrentDate) - [${FUNCNAME[1]}] Fatal: $1" >> "$LOGFILE"
-	echo "[${FUNCNAME[1]}] Fatal: $1"
+	echo "[${FUNCNAME[1]}] Fatal: $1" 1>&2
 	POL_SetupWindow_message "[${FUNCNAME[1]}] Fatal: $1" "$TITLE" # La on affiche quand même 
 	export POL_SCRIPT_FAILED="YES"
 	POL_SetupWindow_Close
diff --git a/lib/scripts.lib b/lib/scripts.lib
index 7551c0e..4a1a37a 100755
--- a/lib/scripts.lib
+++ b/lib/scripts.lib
@@ -39,8 +39,7 @@ POL_Open()
 {
 	# Extended xdg-open function, works for mac
 	# Usage : POL_Open whatever you want
-	
-	POL_Open "$@"
+
 	[ "$POL_OS" == "Mac" ] && open "$@"
 	[ "$POL_OS" == "Linux" ] && xdg-open "$@"
 }
diff --git a/playonlinux-bash b/playonlinux-bash
index 12c29c5..490047e 100755
--- a/playonlinux-bash
+++ b/playonlinux-bash
@@ -35,6 +35,7 @@ then
 	cd "$CURDIR"
 	CURDIR="$(pwd)"
 	cd python
+	export MACHTYPE
 	python wrapper.py "$SCRIPTNAME" "$@"
 else
 	bash "$SCRIPTNAME" "$@"
diff --git a/playonlinux-pkg b/playonlinux-pkg
index a43bf53..1a1a1b6 100755
--- a/playonlinux-pkg
+++ b/playonlinux-pkg
@@ -27,6 +27,7 @@ then
 	cd "$CURDIR"
 	CURDIR="$(pwd)"
 	cd python
+	export MACHTYPE
 	python wrapper.py "$CURDIR/bash/$(basename "$0")" "$@"
 else
 	bash "$PLAYONLINUX/bash/$(basename "$0")" "$@"
diff --git a/playonlinux-url_handler b/playonlinux-url_handler
index a43bf53..1a1a1b6 100755
--- a/playonlinux-url_handler
+++ b/playonlinux-url_handler
@@ -27,6 +27,7 @@ then
 	cd "$CURDIR"
 	CURDIR="$(pwd)"
 	cd python
+	export MACHTYPE
 	python wrapper.py "$CURDIR/bash/$(basename "$0")" "$@"
 else
 	bash "$PLAYONLINUX/bash/$(basename "$0")" "$@"
diff --git a/python/lib/Variables.py b/python/lib/Variables.py
index 294e067..ada1e87 100755
--- a/python/lib/Variables.py
+++ b/python/lib/Variables.py
@@ -42,7 +42,7 @@ else:
 os.environ["POL_USER_ROOT"] = os.environ["REPERTOIRE"]
 os.environ["TITRE"] = os.environ["APPLICATION_TITLE"]
 os.environ["SITE"] = "http://repository.playonlinux.com"
-os.environ["VERSION"] = "4.0.4"
+os.environ["VERSION"] = "4.0.6"
 os.environ["POL_ID"] = str(random.randint(1,100000000))
 os.environ["WINEPREFIX"] = os.environ["REPERTOIRE"]+"/wineprefix/default"
 os.environ["WINE_SITE"] = "http://www.playonlinux.com/wine/binaries/"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/playonlinux.git