From af8a83eca85c9150324438d4d53b56899eab511a Mon Sep 17 00:00:00 2001
From: edulucio <eduardo.lucio@lightbase.com.br>
Date: Fri, 1 Sep 2017 14:45:22 -0300
Subject: [PATCH] Correções diversas! By Questor

---
 LBConverter.tar.gz        | Bin 42220019 -> 0 bytes
 ez_i.bash                 |  6 +++---
 install.bash              | 31 ++++++++-----------------------
 py-packs-LBConverter.bash |  4 ++--
 tux.txt                   |  7 +++++++
 5 files changed, 20 insertions(+), 28 deletions(-)
 create mode 100755 tux.txt

diff --git a/LBConverter.tar.gz b/LBConverter.tar.gz
index 7226f2f..9230854 100644
Binary files a/LBConverter.tar.gz and b/LBConverter.tar.gz differ
diff --git a/ez_i.bash b/ez_i.bash
index 342e221..46188d2 100755
--- a/ez_i.bash
+++ b/ez_i.bash
@@ -441,7 +441,7 @@ f_chk_by_path_hlp() {
         VER_TYPE_P (str): Se o caminho físico é para um diretório ("d") 
     ou arquivo ("f").
         EXIST_MSG_P (Optional[str]): Mensagem a ser "printada" caso o 
-    aplicativo/pacote/arquivo exista. Se não informado ou vazio não 
+    aplicativo/pacote/arquivo/pasta exista. Se não informado ou vazio não 
     exibe a mensagem.
         SKIP_MSG_P (Optional[int]): Não exibir mensagem.
 
@@ -663,9 +663,9 @@ f_yes_no() {
         eval "read -e -t$WAIT_UNTIL_P -r -p \"$QUESTION_P (y/n) (\"$AUT_ANSWER\" in $WAIT_UNTIL_P seconds) \" RESP_V" || echo ""
 
     fi
-    if [[ $RESP_V =~ ^([sS]|[yY])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 1 ] && [ -z "$RESP_V" ] ) ; then
+    if [[ $RESP_V =~ ^([sS]|[yY])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 1 ] && [ -z "$RESP_V" ] && [ -n "$WAIT_UNTIL_P" ] ) ; then
         YES_NO_R=1
-    elif [[ $RESP_V =~ ^([nN])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 0 ] && [ -z "$RESP_V" ] ) ; then
+    elif [[ $RESP_V =~ ^([nN])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 0 ] && [ -z "$RESP_V" ] && [ -n "$WAIT_UNTIL_P" ] ) ; then
         if [ -n "$RESP_V" ] ; then
             echo "NO!"
         fi
diff --git a/install.bash b/install.bash
index 9a07785..840af1e 100755
--- a/install.bash
+++ b/install.bash
@@ -35,8 +35,6 @@ EOF
 read -d '' ABOUT_F <<"EOF"
 This script will install LBC - LBConverter the LightBase OCR (Optical Character 
 Recognition)/data extractor component that obtain data from submitted files!
-
-Have fun! =D
 EOF
 
 read -d '' WARNINGS_F <<"EOF"
@@ -65,11 +63,12 @@ EOF
 
 read -d '' COMPANY_F <<"EOF"
 BR Light LTDA - LightBase Consulting in Public Software/LightBase Consultoria em Software Público
-Software livre! Abrace essa idéia!/Free software! Embrace that idea!
 +55-61-3347-1949/+55-61-3340-6966 - http://brlight.org/ - Brasil-DF
+Free software! Embrace that idea!/Software livre! Abrace essa idéia!
 EOF
 
-f_begin "$TITLE_F" "$VERSION_F" "$ABOUT_F" "$WARNINGS_F" "$COMPANY_F"
+TUX=$(cat $SCRIPTDIR_V/tux.txt)
+f_begin "$TITLE_F" "$VERSION_F" "$ABOUT_F$TUX" "$WARNINGS_F" "$COMPANY_F"
 ABOUT_F=""
 WARNINGS_F=""
 
@@ -507,23 +506,9 @@ BASE_INST_DIR_V="/usr/local/lb"
 # Criar o diretório base da instalação!
 
 f_create_base_dir() {
-    EZ_I_SKIP_ON_V=$FAST_INST
-    QUESTION_F="Insert where the base installation directory (name \"lb\") will be created (don't use \"/\" at the end). 
-Use empty for \"/usr/local\"!"
-    f_div_section
-    f_get_usr_input "$QUESTION_F" 1
-    QUESTION_F=""
-    if [ ${EZ_I_SKIP_ON_V} -eq 1 ] || [ -z "$GET_USR_INPUT_R" ] ; then
-        f_chk_by_path_hlp "$BASE_INST_DIR_V" "d" "\"$BASE_INST_DIR_V\" directory already created!"
-        if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
-            mkdir -p "$BASE_INST_DIR_V"
-        fi
-    else
-        BASE_INST_DIR_V="$GET_USR_INPUT_R/lb"
-        f_chk_by_path_hlp "$BASE_INST_DIR_V" "d" "\"$BASE_INST_DIR_V\" directory already created!"
-        if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
-            mkdir -p "$BASE_INST_DIR_V"
-        fi
+    f_chk_by_path_hlp "$BASE_INST_DIR_V" "d"
+    if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
+        mkdir -p "$BASE_INST_DIR_V"
     fi
 }
 
@@ -548,10 +533,10 @@ f_inst_ve_py2X() {
     fi
     if [[ "$DISTRO_TYPE" == "RH" ]] ; then
         PYTHON_2_X="2.7"
-        VE_2_X="ve27"
+        VE_2_X="lbc_ve27"
     elif [[ "$DISTRO_TYPE" == "DEB" ]] || [[ "$DISTRO_TYPE" == "SUSE" ]] ; then
         PYTHON_2_X="2.7"
-        VE_2_X="ve27"
+        VE_2_X="lbc_ve27"
     fi
     if [ ${DONT_PROMPT_TO_INST} -eq 1 ] || [ ${FAST_INST} -eq 1 ] ; then
         EZ_I_SKIP_ON_V=1
diff --git a/py-packs-LBConverter.bash b/py-packs-LBConverter.bash
index 60ca9c3..4069cbc 100755
--- a/py-packs-LBConverter.bash
+++ b/py-packs-LBConverter.bash
@@ -32,12 +32,12 @@ fi
 
 PYTHON_2_X=$3
 if [ -z "$PYTHON_2_X" ] ; then
-    PYTHON_2_X="2.6"
+    PYTHON_2_X="2.7"
 fi
 
 VE_2_X=$4
 if [ -z "$VE_2_X" ] ; then
-    VE_2_X="ve26"
+    VE_2_X="lbc_ve27"
 fi
 
 f_open_section
diff --git a/tux.txt b/tux.txt
new file mode 100755
index 0000000..2af89bd
--- /dev/null
+++ b/tux.txt
@@ -0,0 +1,7 @@
+
+
+  .~.  Have fun! =D
+  /V\  
+ // \\ Tux
+/(   )\
+ ^`~'^ 
\ No newline at end of file
--
libgit2 0.21.2