Download as
Browse Code »

Commit 720ed0a43fa3f2f7a9ed7d23341a718c62406e56

Authored by edulucio
1 parent fca05c1f
Exists in master

Correções diversas! By Questor

Showing 7 changed files with 26 additions and 34 deletions   Show diff stats
LBIndex.tar.gz
View file @720ed0a
No preview for this file type
ez_i.bash
  Diff comments   View file @720ed0a
... ... @@ -441,7 +441,7 @@ f_chk_by_path_hlp() {
441 441 VER_TYPE_P (str): Se o caminho físico é para um diretório ("d")
442 442 ou arquivo ("f").
443 443 EXIST_MSG_P (Optional[str]): Mensagem a ser "printada" caso o
444   - aplicativo/pacote/arquivo exista. Se não informado ou vazio não
  444 + aplicativo/pacote/arquivo/pasta exista. Se não informado ou vazio não
445 445 exibe a mensagem.
446 446 SKIP_MSG_P (Optional[int]): Não exibir mensagem.
447 447  
... ... @@ -663,9 +663,9 @@ f_yes_no() {
663 663 eval "read -e -t$WAIT_UNTIL_P -r -p \"$QUESTION_P (y/n) (\"$AUT_ANSWER\" in $WAIT_UNTIL_P seconds) \" RESP_V" || echo ""
664 664  
665 665 fi
666   - if [[ $RESP_V =~ ^([sS]|[yY])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 1 ] && [ -z "$RESP_V" ] ) ; then
  666 + if [[ $RESP_V =~ ^([sS]|[yY])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 1 ] && [ -z "$RESP_V" ] && [ -n "$WAIT_UNTIL_P" ] ) ; then
667 667 YES_NO_R=1
668   - elif [[ $RESP_V =~ ^([nN])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 0 ] && [ -z "$RESP_V" ] ) ; then
  668 + elif [[ $RESP_V =~ ^([nN])$ ]] || ( [ ${WAIT_UNTIL_RTN_P} -eq 0 ] && [ -z "$RESP_V" ] && [ -n "$WAIT_UNTIL_P" ] ) ; then
669 669 if [ -n "$RESP_V" ] ; then
670 670 echo "NO!"
671 671 fi
... ...
install.bash
  Diff comments   View file @720ed0a
... ... @@ -24,18 +24,16 @@ read -d '' TITLE_F <<"EOF"
24 24 LBI - LBIndex Installer
25 25 EOF
26 26  
27   -read -d '' VERSION_F <<"EOF"
28   -0.1.2.0
29   -EOF
30   -
31 27 # NOTE: Para versionamento usar "MAJOR.MINOR.REVISION.BUILDNUMBER"!
32 28 # Usar a mesma versão contida no setup.py! By Questor
33 29 # http://programmers.stackexchange.com/questions/24987/what-exactly-is-the-build-number-in-major-minor-buildnumber-revision
34 30  
  31 +read -d '' VERSION_F <<"EOF"
  32 +0.1.2.0
  33 +EOF
  34 +
35 35 read -d '' ABOUT_F <<"EOF"
36 36 This script will install LBI - LBIndex the LightBase indexing component!
37   -
38   -Have fun! =D
39 37 EOF
40 38  
41 39 read -d '' WARNINGS_F <<"EOF"
... ... @@ -64,11 +62,12 @@ EOF
64 62  
65 63 read -d '' COMPANY_F <<"EOF"
66 64 BR Light LTDA - LightBase Consulting in Public Software/LightBase Consultoria em Software Público
67   -Software livre! Abrace essa idéia!/Free software! Embrace that idea!
68 65 +55-61-3347-1949/+55-61-3340-6966 - http://brlight.org/ - Brasil-DF
  66 +Free software! Embrace that idea!/Software livre! Abrace essa idéia!
69 67 EOF
70 68  
71   -f_begin "$TITLE_F" "$VERSION_F" "$ABOUT_F" "$WARNINGS_F" "$COMPANY_F"
  69 +TUX=$(cat $SCRIPTDIR_V/tux.txt)
  70 +f_begin "$TITLE_F" "$VERSION_F" "$ABOUT_F$TUX" "$WARNINGS_F" "$COMPANY_F"
72 71 ABOUT_F=""
73 72 WARNINGS_F=""
74 73  
... ... @@ -518,23 +517,9 @@ BASE_INST_DIR_V=&quot;/usr/local/lb&quot;
518 517 # Criar o diretório base da instalação!
519 518  
520 519 f_create_base_dir() {
521   - EZ_I_SKIP_ON_V=$FAST_INST
522   - QUESTION_F="Insert where the base installation directory (name \"lb\") will be created (don't use \"/\" at the end).
523   -Use empty for \"/usr/local\"!"
524   - f_div_section
525   - f_get_usr_input "$QUESTION_F" 1
526   - QUESTION_F=""
527   - if [ ${EZ_I_SKIP_ON_V} -eq 1 ] || [ -z "$GET_USR_INPUT_R" ] ; then
528   - f_chk_by_path_hlp "$BASE_INST_DIR_V" "d" "\"$BASE_INST_DIR_V\" directory already created!"
529   - if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
530   - mkdir -p "$BASE_INST_DIR_V"
531   - fi
532   - else
533   - BASE_INST_DIR_V="$GET_USR_INPUT_R/lb"
534   - f_chk_by_path_hlp "$BASE_INST_DIR_V" "d" "\"$BASE_INST_DIR_V\" directory already created!"
535   - if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
536   - mkdir -p "$BASE_INST_DIR_V"
537   - fi
  520 + f_chk_by_path_hlp "$BASE_INST_DIR_V" "d"
  521 + if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
  522 + mkdir -p "$BASE_INST_DIR_V"
538 523 fi
539 524 }
540 525  
... ... @@ -559,10 +544,10 @@ f_inst_ve_py2X() {
559 544 fi
560 545 if [[ "$DISTRO_TYPE" == "RH" ]] ; then
561 546 PYTHON_2_X="2.7"
562   - VE_2_X="ve27"
  547 + VE_2_X="lbi_ve27"
563 548 elif [[ "$DISTRO_TYPE" == "DEB" ]] || [[ "$DISTRO_TYPE" == "SUSE" ]] ; then
564 549 PYTHON_2_X="2.7"
565   - VE_2_X="ve27"
  550 + VE_2_X="lbi_ve27"
566 551 fi
567 552 if [ ${DONT_PROMPT_TO_INST} -eq 1 ] || [ ${FAST_INST} -eq 1 ] ; then
568 553 EZ_I_SKIP_ON_V=1
... ...
liblightbase.tar.gz
View file @720ed0a
No preview for this file type
py-packs-LBIndex.bash
  Diff comments   View file @720ed0a
... ... @@ -32,12 +32,12 @@ fi
32 32  
33 33 PYTHON_2_X=$3
34 34 if [ -z "$PYTHON_2_X" ] ; then
35   - PYTHON_2_X="2.6"
  35 + PYTHON_2_X="2.7"
36 36 fi
37 37  
38 38 VE_2_X=$4
39 39 if [ -z "$VE_2_X" ] ; then
40   - VE_2_X="ve26"
  40 + VE_2_X="lbi_ve27"
41 41 fi
42 42  
43 43 f_open_section
... ...
py-packs-liblightbase.bash
  Diff comments   View file @720ed0a
... ... @@ -32,12 +32,12 @@ fi
32 32  
33 33 PYTHON_2_X=$3
34 34 if [ -z "$PYTHON_2_X" ] ; then
35   - PYTHON_2_X="2.6"
  35 + PYTHON_2_X="2.7"
36 36 fi
37 37  
38 38 VE_2_X=$4
39 39 if [ -z "$VE_2_X" ] ; then
40   - VE_2_X="ve26"
  40 + VE_2_X="lbi_ve27"
41 41 fi
42 42  
43 43 f_open_section
... ...
tux.txt 0 → 100755
  Diff comments   View file @720ed0a
... ... @@ -0,0 +1,7 @@
  1 +
  2 +
  3 + .~. Have fun! =D
  4 + /V\
  5 + // \\ Tux
  6 +/( )\
  7 + ^`~'^
0 8 \ No newline at end of file
... ...