Little bugfixes after few years...

BashGui · Apr 13, 2017 · a3199d3 · a3199d3
1 parent ad4222f
commit a3199d3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/README b/README
@@ -203,7 +203,7 @@ Since 5.0.0 version you can use EasyBashGUI even if NO WIDGET is installed (that
 
 Note on gtkdialog mode.
 
-EasyBashGUI sets gtkdialog output statements as variables through "eval". This way, in theory, could be possibly dangerous; nevertheless, so far, I don't know about an alternative way...
+EasyBashGUI sets gtkdialog output statements as variables through "eval". This way, in theory, could be possibly dangerous; nevertheless, so far, I don't know about any alternative way...
 
 
 

diff --git a/debian/control b/debian/control
@@ -9,7 +9,7 @@ Homepage: https://github.com/BashGui/easybashgui
 Package: easybashgui
 Architecture: any
 Depends: ${misc:Depends}
-Description: functions libraries that aims to give simple GUI functions
+Description: functions library that aims to give simple GUI functions
  EasyBashGUI is a Bash functions library for *BSD and GNU/Linux that aims to 
  give simple GUI functions using yad, gtkdialog, kdialog, zenity, Xdialog, 
  (c)dialog, whiptail or bash builtins depending on KDE or GNOME running or not,

diff --git a/debian/copyright b/debian/copyright
@@ -2,7 +2,7 @@ Format: http://dep.debian.net/deps/dep5
 Upstream-Name: easybashgui
 
 Files: *
-Copyright: 2013 Lucio Messina <lucio.messina@mensa.it>
+Copyright: 2017 Lucio Messina <lucio.messina@mensa.it>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

diff --git a/lib/easybashgui.lib b/lib/easybashgui.lib
@@ -8,7 +8,7 @@
 #
 #########################
 #
-# Copyright (C) 2013 Vittorio Cagnetta
+# Copyright (C) 2017 Vittorio Cagnetta
 #
 # Author: Vittorio Cagnetta <vaisarger@gmail.com>
 #
@@ -35,7 +35,7 @@
 #####################################
 #####################################
 #
-LIB_VERSION="10.0.0"
+LIB_VERSION="10.0.1"
 LIB_NAME="easybashgui.lib"
 LIB_URL="https://github.com/BashGui/easybashgui"
 LIB_AUTHOR="Vittorio Cagnetta"
@@ -3789,13 +3789,13 @@ if [ "${mode}" = "yad" ]
 						arg="${arg_pre}"
 					fi
 					#
-					echo -ne "\"${arg}\"\t"
+					echo -ne "\"${arg}\"\t" | gsed s\#'<'#'{--|'#g | gsed s\#'>'#'|--}'#g
 				done )"
 		local IFS=$' \t\n'
 		#
 		#
 		local IFS=$'\t\n'
-			scelta="$(eval $(local IFS=$'\t' ; echo -e "${dialogo}\t${stdout}\t${no_tags}\t--title\t\"${supertitle:-EasyBashGUI}: menu\"\t${menubox}\t${text}\t\"Select option...\"\t${dimensione_finestra}\t${dimensione_menu}\t--separator=''\t${column}\t${parametri}\t2>\t/dev/null" ; local IFS=$'\t\n') )"
+			scelta="$(eval $(local IFS=$'\t' ; echo -e "${dialogo}\t${stdout}\t${no_tags}\t--title\t\"${supertitle:-EasyBashGUI}: menu\"\t${menubox}\t--no-headers\t${text}\t\"Select option...\"\t${dimensione_finestra}\t${dimensione_menu}\t--separator=''\t${column}\t${parametri}\t2>\t/dev/null" ; local IFS=$'\t\n') )"
 			if [ "${dialogo}" = "dialog" ]
 				then
 				if [ $(echo -n "${scelta}" | wc -c) -gt 0 ]
@@ -3807,6 +3807,7 @@ if [ "${mode}" = "yad" ]
 			#
 			####
 			#######
+			scelta="$(echo "${scelta}" | gsed s\#'{--|'#'<'#g | gsed s\#'|--}'#'>'#g )"
 			echo "${scelta}" | grep -v "${string_to_clean}" 1> "${dir_tmp}/${file_tmp}"
 			#######
 			####
@@ -4435,13 +4436,13 @@ if [ "${mode}" = "yad" ]
 							arg="${arg_pre}"
 						fi
 						#
-						echo -ne "\"${arg}\"\t"
+						echo -ne "\"${arg}\"\t" | gsed s\#'<'#'{--|'#g | gsed s\#'>'#'|--}'#g
 					done )"
 		local IFS=$' \t\n'
 		#
 		#
 		local IFS=$'\t\n'
-			scelta="$(eval $(local IFS=$'\t' ; echo -e "${dialogo}\t${stdout}\t${no_tags}\t--title\t\"${supertitle:-EasyBashGUI}: menu\"\t${menubox}\t${text}\t\"Select option...\"\t${dimensione_finestra}\t${dimensione_menu}\t--separator=''\t${column}\t${column}\t${tagged_mode_options}\t${tagged_parametri}\t2>\t/dev/null" ; local IFS=$'\t\n') )"
+			scelta="$(eval $(local IFS=$'\t' ; echo -e "${dialogo}\t${stdout}\t${no_tags}\t--title\t\"${supertitle:-EasyBashGUI}: menu\"\t${menubox}\t--no-headers\t${text}\t\"Select option...\"\t${dimensione_finestra}\t${dimensione_menu}\t--separator=''\t${column}\t${column}\t${tagged_mode_options}\t${tagged_parametri}\t2>\t/dev/null" ; local IFS=$'\t\n') )"
 			if [ "${dialogo}" = "dialog" ]
 				then
 				if [ $(echo -n "${scelta}" | wc -c) -gt 0 ]
@@ -4453,6 +4454,7 @@ if [ "${mode}" = "yad" ]
 			#
 			####
 			#######
+			scelta="$(echo "${scelta}" | gsed s\#'{--|'#'<'#g | gsed s\#'|--}'#'>'#g )"
 			echo "${scelta}" | grep -v "${string_to_clean}" 1> "${dir_tmp}/${file_tmp}"
 			#######
 			####
@@ -5112,7 +5114,7 @@ if [ "${mode}" = "yad" ]
 						then
 						arg="${arg_prog:1}"
 						#
-						echo -ne "\"TRUE\" \"${arg}\" "
+						echo -ne "\"TRUE\" \"${arg}\" " | gsed s\#'<'#'{--|'#g | gsed s\#'>'#'|--}'#g
 						#
 					else
 						#
@@ -5123,7 +5125,7 @@ if [ "${mode}" = "yad" ]
 							arg="${arg_prog}"
 						fi
 						#
-						echo -ne "\"FALSE\" \"${arg}\" "
+						echo -ne "\"FALSE\" \"${arg}\" " | gsed s\#'<'#'{--|'#g | gsed s\#'>'#'|--}'#g
 						#
 					fi #if [ "${first_char}" = "+" ]
 					#
@@ -5136,6 +5138,7 @@ if [ "${mode}" = "yad" ]
 		scelte="$(eval ${dialogo} --title \"${supertitle:-EasyBashGUI}: list\" --separator \"\\n\" --list --checklist --column \" \" --column \" \" --text \"Select multiple options...\" ${dimensione_finestra_1} ${dimensione_finestra_2} ${parametri} 2> /dev/null )"
 		exit_code="${?}"
 		#
+		scelte="$(echo "${scelte}" | gsed s\#'{--|'#'<'#g | gsed s\#'|--}'#'>'#g )"
 		echo -e "${scelte}" | gsed s\#'^TRUE$'#''# | gsed '/^$/d' 1> "${dir_tmp}/${file_tmp}"
 		#
 		#

diff --git a/lib/easybashlib b/lib/easybashlib
@@ -41,9 +41,12 @@ eb_incl_easybashlib__imported=please_prevent_next_time
 
 # Bash debugging:
 : we_are_here
-declare BASH_SOURCE ; [ "${BASH_SOURCE:-unset}" = "unset" ] && declare -r BASH_SOURCE="${eb_runtime_invoke_name}"
-declare LINENO ; [ "${LINENO:-unset}" = "unset" ] && declare -ir LINENO="0"
-declare FUNCNAME ; [ "${FUNCNAME:-unset}" = "unset" ] && declare -r FUNCNAME="unknown_function"
+[ $(declare | grep "BASH_SOURCE=" | wc -c ) -eq 0 ] && declare BASH_SOURCE ; \
+		[ "${BASH_SOURCE:-unset}" = "unset" ] && declare -r BASH_SOURCE="${eb_runtime_invoke_name}"
+[ $(declare | grep "LINENO=" | wc -c ) -eq 0 ] && declare LINENO ; \
+		[ "${LINENO:-unset}" = "unset" ] && declare -ir LINENO="0"
+[ $(declare | grep "FUNCNAME=" | wc -c ) -eq 0 ] && declare FUNCNAME ; \
+		[ "${FUNCNAME:-unset}" = "unset" ] && declare -r FUNCNAME="unknown_function"
 export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
 
 #set -o verbose -o xtrace

diff --git a/makefile b/makefile
@@ -1,5 +1,5 @@
 #EBGlib=$(wildcard easybashgui_[0-9].[0-9].[0-9])
-VERSION=10.0.0
+VERSION=10.0.1
 
 #cartelle di destinazione
 DESTDIR ?= ""
Original file line number	Diff line number	Diff line change
Expand Up		@@ -203,7 +203,7 @@ Since 5.0.0 version you can use EasyBashGUI even if NO WIDGET is installed (that

		Note on gtkdialog mode.

		EasyBashGUI sets gtkdialog output statements as variables through "eval". This way, in theory, could be possibly dangerous; nevertheless, so far, I don't know about an alternative way...
		EasyBashGUI sets gtkdialog output statements as variables through "eval". This way, in theory, could be possibly dangerous; nevertheless, so far, I don't know about any alternative way...



Expand Down