Download as
Browse Code »

Commit af8a83eca85c9150324438d4d53b56899eab511a

Authored by edulucio
1 parent cb3d50dc
Exists in master

Correções diversas! By Questor

Showing 5 changed files with 20 additions and 28 deletions   Show diff stats
LBConverter.tar.gz
View file @af8a83e
No preview for this file type
ez_i.bash
  Diff comments   View file @af8a83e
... ... @@ -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 @af8a83e
... ... @@ -35,8 +35,6 @@ EOF
35 35 read -d '' ABOUT_F <<"EOF"
36 36 This script will install LBC - LBConverter the LightBase OCR (Optical Character
37 37 Recognition)/data extractor component that obtain data from submitted files!
38   -
39   -Have fun! =D
40 38 EOF
41 39  
42 40 read -d '' WARNINGS_F <<"EOF"
... ... @@ -65,11 +63,12 @@ EOF
65 63  
66 64 read -d '' COMPANY_F <<"EOF"
67 65 BR Light LTDA - LightBase Consulting in Public Software/LightBase Consultoria em Software Público
68   -Software livre! Abrace essa idéia!/Free software! Embrace that idea!
69 66 +55-61-3347-1949/+55-61-3340-6966 - http://brlight.org/ - Brasil-DF
  67 +Free software! Embrace that idea!/Software livre! Abrace essa idéia!
70 68 EOF
71 69  
72   -f_begin "$TITLE_F" "$VERSION_F" "$ABOUT_F" "$WARNINGS_F" "$COMPANY_F"
  70 +TUX=$(cat $SCRIPTDIR_V/tux.txt)
  71 +f_begin "$TITLE_F" "$VERSION_F" "$ABOUT_F$TUX" "$WARNINGS_F" "$COMPANY_F"
73 72 ABOUT_F=""
74 73 WARNINGS_F=""
75 74  
... ... @@ -507,23 +506,9 @@ BASE_INST_DIR_V=&quot;/usr/local/lb&quot;
507 506 # Criar o diretório base da instalação!
508 507  
509 508 f_create_base_dir() {
510   - EZ_I_SKIP_ON_V=$FAST_INST
511   - QUESTION_F="Insert where the base installation directory (name \"lb\") will be created (don't use \"/\" at the end).
512   -Use empty for \"/usr/local\"!"
513   - f_div_section
514   - f_get_usr_input "$QUESTION_F" 1
515   - QUESTION_F=""
516   - if [ ${EZ_I_SKIP_ON_V} -eq 1 ] || [ -z "$GET_USR_INPUT_R" ] ; then
517   - f_chk_by_path_hlp "$BASE_INST_DIR_V" "d" "\"$BASE_INST_DIR_V\" directory already created!"
518   - if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
519   - mkdir -p "$BASE_INST_DIR_V"
520   - fi
521   - else
522   - BASE_INST_DIR_V="$GET_USR_INPUT_R/lb"
523   - f_chk_by_path_hlp "$BASE_INST_DIR_V" "d" "\"$BASE_INST_DIR_V\" directory already created!"
524   - if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
525   - mkdir -p "$BASE_INST_DIR_V"
526   - fi
  509 + f_chk_by_path_hlp "$BASE_INST_DIR_V" "d"
  510 + if [ ${F_CHK_BY_PATH_HLP_R} -eq 0 ] ; then
  511 + mkdir -p "$BASE_INST_DIR_V"
527 512 fi
528 513 }
529 514  
... ... @@ -548,10 +533,10 @@ f_inst_ve_py2X() {
548 533 fi
549 534 if [[ "$DISTRO_TYPE" == "RH" ]] ; then
550 535 PYTHON_2_X="2.7"
551   - VE_2_X="ve27"
  536 + VE_2_X="lbc_ve27"
552 537 elif [[ "$DISTRO_TYPE" == "DEB" ]] || [[ "$DISTRO_TYPE" == "SUSE" ]] ; then
553 538 PYTHON_2_X="2.7"
554   - VE_2_X="ve27"
  539 + VE_2_X="lbc_ve27"
555 540 fi
556 541 if [ ${DONT_PROMPT_TO_INST} -eq 1 ] || [ ${FAST_INST} -eq 1 ] ; then
557 542 EZ_I_SKIP_ON_V=1
... ...
py-packs-LBConverter.bash
  Diff comments   View file @af8a83e
... ... @@ -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="lbc_ve27"
41 41 fi
42 42  
43 43 f_open_section
... ...
tux.txt 0 → 100755
  Diff comments   View file @af8a83e
... ... @@ -0,0 +1,7 @@
  1 +
  2 +
  3 + .~. Have fun! =D
  4 + /V\
  5 + // \\ Tux
  6 +/( )\
  7 + ^`~'^
0 8 \ No newline at end of file
... ...