Changeset 5019


Ignore:
Timestamp:
Jun 1, 2017, 2:50:02 PM (2 years ago)
Author:
jrpelegrina
Message:

WIP in fix dni installation

Location:
zero-lliurex-dni/trunk/fuentes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • zero-lliurex-dni/trunk/fuentes/lliurex-po/zero-lliurex-dni/zero-lliurex-dni.pot

    r507 r5019  
    99"Project-Id-Version: PACKAGE VERSION\n"
    1010"Report-Msgid-Bugs-To: \n"
    11 "POT-Creation-Date: 2015-05-14 09:41+0200\n"
     11"POT-Creation-Date: 2017-06-01 14:39+0200\n"
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
     
    1919
    2020#: zero-lliurex-dni.zmd:21
     21#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:28
     22#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:21
    2123msgid "Library not found:"
    2224msgstr ""
    2325
    2426#: zero-lliurex-dni.zmd:22
     27#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:34
     28#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:22
    2529msgid "Some problem with firefox profile"
    2630msgstr ""
    2731
    2832#: zero-lliurex-dni.zmd:23
     33#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:35
     34#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:23
    2935msgid "Start firefox once at least"
    3036msgstr ""
    3137
    3238#: zero-lliurex-dni.zmd:24
     39#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:36
     40#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:24
    3341msgid "Some problem with Thunderbird profile"
    3442msgstr ""
    3543
    3644#: zero-lliurex-dni.zmd:25
     45#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:37
     46#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:25
    3747msgid "Start Thunderbird once at least"
    3848msgstr ""
    3949
    4050#: zero-lliurex-dni.zmd:26
     51#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:38
     52#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:26
    4153msgid "Firefox is running. Stop it!"
    4254msgstr ""
    4355
    4456#: zero-lliurex-dni.zmd:27
     57#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:39
     58#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:27
    4559msgid "Thunderbird is running. Stop it!"
    4660msgstr ""
    4761
    4862#: zero-lliurex-dni.zmd:28
     63#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:40
     64#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:28
    4965msgid "Firefox is not installed"
    5066msgstr ""
    5167
    5268#: zero-lliurex-dni.zmd:29
     69#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:41
     70#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:29
    5371msgid "Thunderbird is not installed"
    5472msgstr ""
    5573
    5674#: zero-lliurex-dni.zmd:30
     75#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:30
    5776msgid "Installing DNIe in your computer..."
    5877msgstr ""
    5978
    6079#: zero-lliurex-dni.zmd:31
     80#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:31
    6181msgid "Installing DNIe modules in your system"
    6282msgstr ""
    6383
    6484#: zero-lliurex-dni.zmd:32
     85#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:32
    6586msgid "DNIe modules in Firefox"
    6687msgstr ""
    6788
    6889#: zero-lliurex-dni.zmd:33
     90#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:33
    6991msgid "DNIe modules in Thunderbird"
    7092msgstr ""
    7193
    7294#: zero-lliurex-dni.zmd:34
     95#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:34
    7396msgid ""
    7497"Impossible to install DNIe module, correct the problems and execute this "
     
    77100
    78101#: zero-lliurex-dni.zmd:35
     102#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:35
    79103msgid ""
    80104"DNIe modules are installed with success in Firefox and Thunderbird profile, "
     
    84108#: zero-lliurex-dni.zmd:36
    85109msgid ""
    86 "We have to create your Thunderbird profile, "
    87 "now it will be launched, "
    88 "then please close Thunderbird and installation continues."
     110"We have to create your Thunderbird profile, now it will be launched, then "
     111"please close Thunderbird and installation continues."
    89112msgstr ""
    90113
    91114#: zero-lliurex-accv.zmd:29
     115#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:42
    92116msgid "Installing ACCV in your computer..."
    93117msgstr ""
    94118
    95119#: zero-lliurex-accv.zmd:30
     120#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:43
    96121msgid "Installing ACCV modules in your system"
    97122msgstr ""
    98123
    99124#: zero-lliurex-accv.zmd:31
     125#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:44
    100126msgid "ACCV modules in Firefox"
    101127msgstr ""
    102128
    103129#: zero-lliurex-accv.zmd:32
     130#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:45
    104131msgid "ACCV modules in Thunderbird"
    105132msgstr ""
    106133
    107134#: zero-lliurex-accv.zmd:33
     135#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:46
    108136msgid ""
    109137"Impossible to install ACCV module, correct the problems and execute this "
     
    119147#: zero-lliurex-accv.zmd:37
    120148msgid ""
    121 "We have to create your Firefox profile, "
    122 "now it will be launched, "
    123 "then please close Firefox and installation continues."
    124 msgstr ""
     149"We have to create your Firefox profile, now it will be launched, then please "
     150"close Firefox and installation continues."
     151msgstr ""
     152
     153#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:25
     154msgid "Cancel"
     155msgstr ""
     156
     157#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:26
     158msgid "Install"
     159msgstr ""
     160
     161#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:27
     162msgid "ACCV CARD READER CONFIGURATOR"
     163msgstr ""
     164
     165#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:29
     166msgid "is not in your system, impossible to create link."
     167msgstr ""
     168
     169#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:30
     170msgid ""
     171"is impossible to install , perhaps you have some problems with repositories."
     172msgstr ""
     173
     174#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:31
     175msgid ""
     176"With this assitent you are going to install card drivers\\nfrom ACCV to use "
     177"in Firefox and Thunderbird."
     178msgstr ""
     179
     180#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:32
     181msgid "Card readers accepted:"
     182msgstr ""
     183
     184#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:33
     185msgid "Unstable card readers:"
     186msgstr ""
     187
     188#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:47
     189msgid ""
     190"ACCV modules are installed with success in Firefox and Thunderbird profile,"
     191"\\nfor others users you have to execute this action again on each session,"
     192"\\nOLNY if they are not new users in the system."
     193msgstr ""
     194
     195#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:48
     196msgid ""
     197"We have to create your Thundebird profile, now it will be launched, please "
     198"close thunderbird and installation continues"
     199msgstr ""
     200
     201#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd:49
     202msgid ""
     203"We have to create your Firefox profile, now it will be launched, then please "
     204"close Firefox and installation continues"
     205msgstr ""
     206
     207#: ../zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd:36
     208msgid ""
     209"We have to create your Thunderbird profile, now it will be launched, then "
     210"please close Thunderbird and installation continues"
     211msgstr ""
  • zero-lliurex-dni/trunk/fuentes/zero-lliurex-dni.zlaunchers/zero-lliurex-accv.zmd

    r1876 r5019  
    374374                echo "Mozilla THUNDERBIRD default preseed has the link" >> $ACCV_LOG
    375375        fi
    376         echo "Link for THUNDERBIRD library has created in $ROUTE_MOZILLA$LIBRARY" >> $ACC
     376        echo "Link for THUNDERBIRD library has created in $ROUTE_MOZILLA$LIBRARY" >> $ACCV_LOG
    377377       
    378378
  • zero-lliurex-dni/trunk/fuentes/zero-lliurex-dni.zlaunchers/zero-lliurex-dni.zmd

    r507 r5019  
    4141# Si falla la instalacion del paquete se aborat el resto y da error
    4242if [ $? != 0 ] ; then
    43         zenity --error --text="Impossible to install libpkcs11-dnie problems with repos. $MSG_FINAL_ERROR"
    44         exit 1
     43  zenity --error --text="Impossible to install libpkcs11-dnie problems with repos. $MSG_FINAL_ERROR"
     44  exit 1
    4545fi
    4646
     
    5252user_home(){
    5353   
    54    USER_HOME=$(getent passwd "$USER_NAME" | cut -d: -f 6)
     54  USER_HOME=$(getent passwd "$USER_NAME" | cut -d: -f 6)
     55
    5556}
    5657
    5758test_libpkcs11_dnie(){
    5859
    59    if [ ! -f $LIBRARY ]; then
    60       zenity --info --text="$MSG_LIBRARY_NOT_FOUND $LIBRARY"
    61       exit 1
    62       ERROR=1
    63       echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    64    fi
     60  if [ ! -f $LIBRARY ]; then
     61    zenity --info --text="$MSG_LIBRARY_NOT_FOUND $LIBRARY"
     62    exit 1
     63    ERROR=1
     64    echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
     65  fi
     66
     67}
     68
     69
     70init_secmod_firefox(){
     71
     72  if [ -f "$FF_PROFILE_PATH/secmod.db" ]; then
     73    rm $FF_PROFILE_PATH/secmod.db
     74  fi
     75
     76}
     77
     78
     79init_secmod_thunderbird(){
     80
     81  if [ -f "$TH_PROFILE_PATH/secmod.db" ]; then
     82    rm $TH_PROFILE_PATH/secmod.db
     83  fi
     84
    6585}
    6686
    6787test_running_firefox(){
    6888
    69    is_running=$(ps -fe | grep /usr/lib/firefox/firefox | grep -v grep | wc -l)
    70    if [ $is_running -gt 0 ]; then
    71         return 1
    72    else
    73         return 0
    74    fi
     89  is_running=$(ps -fe | grep /usr/lib/firefox/firefox | grep -v grep | wc -l)
     90  if [ $is_running -gt 0 ]; then
     91    return 1
     92  else
     93    return 0
     94  fi
     95
    7596}
    7697
    7798test_running_thunderbird(){
    7899
    79    is_running=$(ps -fe | grep thunderbird | grep -v grep | wc -l)
    80         if [ $is_running -gt 0 ]; then
    81                 while [ $is_running -gt 0 ] ; do
    82                         zenity --info --text="$MSG_RUNNING_THUNDER"
    83                         is_running=$(ps -fe | grep thunderbird | grep -v grep | wc -l)
    84                 done
    85         fi
    86         return 0
     100  is_running=$(ps -fe | grep thunderbird | grep -v grep | wc -l)
     101  if [ $is_running -gt 0 ]; then
     102    while [ $is_running -gt 0 ] ; do
     103      zenity --info --text="$MSG_RUNNING_THUNDER"
     104      is_running=$(ps -fe | grep thunderbird | grep -v grep | wc -l)
     105    done
     106  fi
     107  return 0
    87108       
    88109}
     
    90111test_installed_package(){
    91112
    92    dpkg -s $1
    93    iRESULT=$?
    94    if [ $iRESULT -eq 1 ]; then
    95         return 0
    96    else
    97         return 1
    98    fi
     113  dpkg -s $1
     114  iRESULT=$?
     115  if [ $iRESULT -eq 1 ]; then
     116    return 0
     117  else
     118    return 1
     119  fi
     120
    99121}
    100122
     
    114136   # get first profile in other case
    115137 
    116    TMP_FILE=$(mktemp)
    117    cat $FF_PATH/profiles.ini | awk -F ' *= *' '{ if ($1 ~ /^\[/) section=$1; else if ($1 !~ /^$/) print $1 section "=" "\"" $2 "\"" }' > $TMP_FILE
    118    DEFAULT_EXISTS=$(grep ^Default $TMP_FILE)
    119    if [ -n $DEFAULT_EXISTS ]; then
    120         PROFILE_ID=$(cat $TMP_FILE | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
    121    else
    122         PROFILE_ID=$(echo $DEFAULT_EXISTS | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
    123    fi
    124    IS_RELATIVE=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^IsRelative | cut -d"=" -f 2 | sed -e 's/\"//g')
    125    TMP_PATH=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^Path | cut -d"=" -f 2 | sed -e 's/\"//g')
    126    if [ $IS_RELATIVE = "0" ]; then
    127       FF_PROFILE_PATH=$TMP_PATH
    128    else
    129       FF_PROFILE_PATH=$FF_PATH/$TMP_PATH
    130    fi
    131    rm -f $TMP_FILE
     138  TMP_FILE=$(mktemp)
     139  cat $FF_PATH/profiles.ini | awk -F ' *= *' '{ if ($1 ~ /^\[/) section=$1; else if ($1 !~ /^$/) print $1 section "=" "\"" $2 "\"" }' > $TMP_FILE
     140  DEFAULT_EXISTS=$(grep ^Default $TMP_FILE)
     141  if [ -n $DEFAULT_EXISTS ]; then
     142    PROFILE_ID=$(cat $TMP_FILE | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
     143  else
     144    PROFILE_ID=$(echo $DEFAULT_EXISTS | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
     145  fi
     146  IS_RELATIVE=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^IsRelative | cut -d"=" -f 2 | sed -e 's/\"//g')
     147  TMP_PATH=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^Path | cut -d"=" -f 2 | sed -e 's/\"//g')
     148  if [ $IS_RELATIVE = "0" ]; then
     149    FF_PROFILE_PATH=$TMP_PATH
     150  else
     151    FF_PROFILE_PATH=$FF_PATH/$TMP_PATH
     152  fi
     153  rm -f $TMP_FILE
     154
    132155}
    133156
     
    144167   # get first profile in other case
    145168 
    146    TMP_FILE=$(mktemp)
    147    cat $TH_PATH/profiles.ini | awk -F ' *= *' '{ if ($1 ~ /^\[/) section=$1; else if ($1 !~ /^$/) print $1 section "=" "\"" $2 "\"" }' > $TMP_FILE
    148    DEFAULT_EXISTS=$(grep ^Default $TMP_FILE)
    149    if [ -n $DEFAULT_EXISTS ]; then
    150         PROFILE_ID=$(cat $TMP_FILE | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
    151    else
    152         PROFILE_ID=$(echo $DEFAULT_EXISTS | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
    153    fi
    154    IS_RELATIVE=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^IsRelative | cut -d"=" -f 2 | sed -e 's/\"//g')
    155    TMP_PATH=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^Path | cut -d"=" -f 2 | sed -e 's/\"//g')
    156    if [ $IS_RELATIVE = "0" ]; then
    157       TH_PROFILE_PATH=$TMP_PATH
    158    else
    159       TH_PROFILE_PATH=$TH_PATH/$TMP_PATH
    160    fi
    161    rm -f $TMP_FILE
     169  TMP_FILE=$(mktemp)
     170  cat $TH_PATH/profiles.ini | awk -F ' *= *' '{ if ($1 ~ /^\[/) section=$1; else if ($1 !~ /^$/) print $1 section "=" "\"" $2 "\"" }' > $TMP_FILE
     171  DEFAULT_EXISTS=$(grep ^Default $TMP_FILE)
     172  if [ -n $DEFAULT_EXISTS ]; then
     173    PROFILE_ID=$(cat $TMP_FILE | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
     174  else
     175    PROFILE_ID=$(echo $DEFAULT_EXISTS | grep -m 1 Profile[0-9] | cut -d"[" -f 2 | cut -d"]" -f 1 )
     176  fi
     177  IS_RELATIVE=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^IsRelative | cut -d"=" -f 2 | sed -e 's/\"//g')
     178  TMP_PATH=$(cat $TMP_FILE | grep $PROFILE_ID | grep ^Path | cut -d"=" -f 2 | sed -e 's/\"//g')
     179  if [ $IS_RELATIVE = "0" ]; then
     180    TH_PROFILE_PATH=$TMP_PATH
     181  else
     182    TH_PROFILE_PATH=$TH_PATH/$TMP_PATH
     183  fi
     184  rm -f $TMP_FILE
     185
    162186}
    163187
    164188test_firefox_user_profile() {
    165189
    166    if [ -d $FF_PATH ]; then
    167         get_firefox_default_profile
    168         if [ ! -d $FF_PROFILE_PATH ]; then
    169                 zenity --info --text="$MSG_SOME_PROBLEM_FIREFOX"
    170                 ERROR=1
    171                 echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    172                 return 0
    173                
    174         fi
    175         return 1
    176    else
    177         zenity --info --text="$MSG_ONCE_FIREFOX"
    178         ERROR=1
    179         echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    180         exit 3
    181    fi
     190  if [ -d $FF_PATH ]; then
     191    get_firefox_default_profile
     192    if [ ! -d $FF_PROFILE_PATH ]; then
     193      zenity --info --text="$MSG_SOME_PROBLEM_FIREFOX"
     194      ERROR=1
     195      echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
     196      return 0
     197    fi
     198    return 1
     199  else
     200    zenity --info --text="$MSG_ONCE_FIREFOX"
     201    ERROR=1
     202    echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
     203    exit 3
     204  fi
    182205       
    183206}
     
    185208test_thunderbird_user_profile() {
    186209
    187    if [ -d $TH_PATH ]; then
    188         get_thunderbird_default_profile
    189         if [ ! -d $TH_PROFILE_PATH ]; then
    190                 zenity --info --text="$MSG_SOME_PROBLEM_THUNDER"
    191                 ERROR=1
    192                 echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    193                 return 0
    194         fi
    195         return 1
    196    else
    197         zenity --info --text="$MSG_CREATING_THUNDER"
    198         su $USER -c "thunderbird"
    199         test_running_thunderbird
    200         get_thunderbird_default_profile
    201    fi
     210  if [ -d $TH_PATH ]; then
     211    get_thunderbird_default_profile
     212    if [ ! -d $TH_PROFILE_PATH ]; then
     213      zenity --info --text="$MSG_SOME_PROBLEM_THUNDER"
     214      ERROR=1
     215      echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
     216      return 0
     217    fi
     218    return 1
     219  else
     220    zenity --info --text="$MSG_CREATING_THUNDER"
     221    su $USER -c "thunderbird"
     222    test_running_thunderbird
     223    get_thunderbird_default_profile
     224  fi
    202225       
    203226}
     
    205228test_firefox_dni_module(){
    206229
    207    if [ -z $FF_MODULE_EXISTS ]; then
    208         return 1
    209    fi
    210    return 0
     230  if [ -z $FF_MODULE_EXISTS ]; then
     231    return 1
     232  fi
     233  return 0
     234
    211235}
    212236
    213237test_thunderbird_dni_module(){
    214238
    215    if [ -z $TH_MODULE_EXISTS ]; then
    216         return 1
    217    fi
    218    return 0
     239  if [ -z $TH_MODULE_EXISTS ]; then
     240    return 1
     241  fi
     242  return 0
     243
    219244}
    220245
     
    245270do_firefox(){
    246271
    247    test_installed_package "firefox"
    248    if [ $? ]; then
    249         test_running_firefox
    250         if [ $? -gt 0 ]; then
    251                 ERROR=1
    252                 echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    253                 zenity --info --text="$MSG_RUNNING_FIREFOX"
    254                 exit 2
    255         else
    256                 test_firefox_user_profile
    257                 test_ff_up=$?
    258                 echo "--->"$test_ff_up"<---"
    259                 if [ $? ]; then
    260                         remove_dni_module_firefox
    261                         enable_dni_module_firefox
    262                 fi
    263         fi
    264    else
     272  test_installed_package "firefox"
     273  if [ $? ]; then
     274    test_running_firefox
     275    if [ $? -gt 0 ]; then
    265276      ERROR=1
    266277      echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    267       zenity --info --text="$MSG_NOT_FIREFOX"
    268       exit 1
    269    fi
     278      zenity --info --text="$MSG_RUNNING_FIREFOX"
     279      exit 2
     280    else
     281      test_firefox_user_profile
     282      test_ff_up=$?
     283      echo "--->"$test_ff_up"<---"
     284      if [ $? ]; then
     285        init_secmod_firefox
     286        remove_dni_module_firefox
     287        enable_dni_module_firefox
     288      fi
     289    fi
     290  else
     291    ERROR=1
     292    echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
     293    zenity --info --text="$MSG_NOT_FIREFOX"
     294    exit 1
     295  fi
     296
    270297}
    271298
    272299do_thunderbird(){
    273300
    274    test_installed_package "thunderbird"
    275    if [ $? ]; then
    276         test_running_thunderbird # and waits to close
    277         test_thunderbird_user_profile # and create if doesnt exist
    278         test_th_up=$?
    279         echo "--->"$test_th_up"<---"
    280         if [ $? ]; then
    281                 remove_dni_module_thunderbird
    282                 enable_dni_module_thunderbird
    283         fi
    284    else
    285       zenity --info --text="$MSG_NOT_THUNDER"
    286       ERROR=1
    287       echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
    288       exit 1
    289    fi
     301  test_installed_package "thunderbird"
     302  if [ $? ]; then
     303    test_running_thunderbird # and waits to close
     304    test_thunderbird_user_profile # and create if doesnt exist
     305    test_th_up=$?
     306    echo "--->"$test_th_up"<---"
     307    if [ $? ]; then
     308      init_secmod_thunderbird
     309      remove_dni_module_thunderbird
     310      enable_dni_module_thunderbird
     311    fi
     312  else
     313    zenity --info --text="$MSG_NOT_THUNDER"
     314    ERROR=1
     315    echo "$ERROR" > /tmp/zero-lliurex-dni.tmp
     316    exit 1
     317  fi
    290318}
    291319
     
    327355
    328356if [ $ERROR != 0 ] ; then 
    329         zenity --error --text="$MSG_FINAL_ERROR" 
    330         exit 1
    331   else
    332         zenity --info --text="$MSG_FINAL_OK"
     357  zenity --error --text="$MSG_FINAL_ERROR" 
     358  exit 1
     359else
     360  zenity --info --text="$MSG_FINAL_OK"
    333361fi
    334362exit 0
Note: See TracChangeset for help on using the changeset viewer.