diff --git a/LBIndex.tar.gz b/LBIndex.tar.gz index 80e652d..65a4bd4 100644 Binary files a/LBIndex.tar.gz and b/LBIndex.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 454b838..be0d685 100755 --- a/install.bash +++ b/install.bash @@ -24,18 +24,16 @@ read -d '' TITLE_F <<"EOF" LBI - LBIndex Installer EOF -read -d '' VERSION_F <<"EOF" -0.1.2.0 -EOF - # NOTE: Para versionamento usar "MAJOR.MINOR.REVISION.BUILDNUMBER"! # Usar a mesma versão contida no setup.py! By Questor # http://programmers.stackexchange.com/questions/24987/what-exactly-is-the-build-number-in-major-minor-buildnumber-revision +read -d '' VERSION_F <<"EOF" +0.1.2.0 +EOF + read -d '' ABOUT_F <<"EOF" This script will install LBI - LBIndex the LightBase indexing component! - -Have fun! =D EOF read -d '' WARNINGS_F <<"EOF" @@ -64,11 +62,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="" @@ -518,23 +517,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 } @@ -559,10 +544,10 @@ f_inst_ve_py2X() { fi if [[ "$DISTRO_TYPE" == "RH" ]] ; then PYTHON_2_X="2.7" - VE_2_X="ve27" + VE_2_X="lbi_ve27" elif [[ "$DISTRO_TYPE" == "DEB" ]] || [[ "$DISTRO_TYPE" == "SUSE" ]] ; then PYTHON_2_X="2.7" - VE_2_X="ve27" + VE_2_X="lbi_ve27" fi if [ ${DONT_PROMPT_TO_INST} -eq 1 ] || [ ${FAST_INST} -eq 1 ] ; then EZ_I_SKIP_ON_V=1 diff --git a/liblightbase.tar.gz b/liblightbase.tar.gz index 7062ddb..e275adf 100644 Binary files a/liblightbase.tar.gz and b/liblightbase.tar.gz differ diff --git a/py-packs-LBIndex.bash b/py-packs-LBIndex.bash index 346982d..dc00c1f 100755 --- a/py-packs-LBIndex.bash +++ b/py-packs-LBIndex.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="lbi_ve27" fi f_open_section diff --git a/py-packs-liblightbase.bash b/py-packs-liblightbase.bash index 710b810..31e9b90 100755 --- a/py-packs-liblightbase.bash +++ b/py-packs-liblightbase.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="lbi_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