diff --git a/bin/zettlr_install.sh b/bin/zettlr_install.sh index 4257530..3b41a36 100755 --- a/bin/zettlr_install.sh +++ b/bin/zettlr_install.sh @@ -527,12 +527,17 @@ if [ $UNINSTALL -eq 1 ]; then if [ $ZETTLR_INSTALLED -eq 1 ]; then dialog_yesno "¿${head_delete} Zettlr Markdown Editor?" if [ $? -eq 0 ]; then - uninstall_zettlr + # Limpiar pantalla y ejecutar en consola + clear + echo -e "\n=== ${head_delete} Zettlr Markdown Editor ===" - if [ $? -eq 0 ]; then - dialog_error_box "${head_success}" "Zettlr ha sido desinstalado correctamente." + uninstall_zettlr + UNINSTALL_RESULT=$? + + if [ $UNINSTALL_RESULT -eq 0 ]; then + echo -e "\n=== ${head_success}: Zettlr ha sido desinstalado correctamente ===" else - dialog_error_box "${head_error}" "No se pudo desinstalar Zettlr." + echo -e "\n=== ${head_error}: No se pudo desinstalar Zettlr ===" fi else dialog_error_box "${head_canceled}" "${head_op_error}" @@ -546,76 +551,52 @@ else # Preguntar si desea reinstalar dialog_yesno "Zettlr ${head_version} ya está instalado.\n\n¿Desea reinstalarlo?" if [ $? -eq 0 ]; then - # Mostrar un progress bar para indicar el avance de la instalación - ( - # Inicializar progreso - echo 0; sleep 1 - echo 20; echo "# ${zl_003}" - sleep 1 - echo 40; echo "# ${zl_004}" - sleep 1 - echo 60; echo "# ${zl_005}" - - # Desinstalar e instalar Zettlr - uninstall_zettlr && install_zettlr - INSTALL_RESULT=$? - - # Verificar el resultado de la instalación - if [ $INSTALL_RESULT -eq 0 ]; then - echo 90; echo "# ${zl_006}" - else - echo 90; echo "# ${zl_008}" + # Limpiar pantalla y ejecutar en consola + clear + echo -e "\n=== ${zl_003} ===" + sleep 1 + echo -e "\n=== ${zl_004} ===" + sleep 1 + echo -e "\n=== ${zl_005} ===" + + # Desinstalar e instalar Zettlr + uninstall_zettlr && install_zettlr + INSTALL_RESULT=$? + + # Verificar el resultado de la instalación + if [ $INSTALL_RESULT -eq 0 ]; then + echo -e "\n=== ${zl_006} ===" + if [ $INSTALL_SUCCESS -eq 1 ]; then + echo -e "\n${ZETTLR_INFO}" fi - sleep 1 - - # Finalizar - echo 100 - sleep 1 - ) | dialog --backtitle "${title}" --title "${apps_title}" --gauge "${zl_010}" 10 70 0 - - # Verificar la versión instalada - if [ $INSTALL_SUCCESS -eq 1 ]; then - dialog_error_box "${npm_014}" "${zl_006}\n\n${ZETTLR_INFO}" else - dialog_error_box "${head_error}" "${zl_008}" + echo -e "\n=== ${zl_008} ===" fi fi else # Preguntar si desea instalar dialog_yesno "${zl_009}" if [ $? -eq 0 ]; then - # Mostrar un progress bar para indicar el avance de la instalación - ( - # Inicializar progreso - echo 0; sleep 1 - echo 20; echo "# ${zl_003}" - sleep 1 - echo 40; echo "# ${zl_004}" - sleep 1 - echo 60; echo "# ${zl_005}" - - # Instalar Zettlr - install_zettlr - INSTALL_RESULT=$? - - # Verificar el resultado de la instalación - if [ $INSTALL_RESULT -eq 0 ]; then - echo 90; echo "# ${zl_006}" - else - echo 90; echo "# ${zl_008}" + # Limpiar pantalla y ejecutar en consola + clear + echo -e "\n=== ${zl_003} ===" + sleep 1 + echo -e "\n=== ${zl_004} ===" + sleep 1 + echo -e "\n=== ${zl_005} ===" + + # Instalar Zettlr + install_zettlr + INSTALL_RESULT=$? + + # Verificar el resultado de la instalación + if [ $INSTALL_RESULT -eq 0 ]; then + echo -e "\n=== ${zl_006} ===" + if [ $INSTALL_SUCCESS -eq 1 ]; then + echo -e "\n${ZETTLR_INFO}" fi - sleep 1 - - # Finalizar - echo 100 - sleep 1 - ) | dialog --backtitle "${title}" --title "${apps_title}" --gauge "${zl_010}" 10 70 0 - - # Verificar la versión instalada - if [ $INSTALL_SUCCESS -eq 1 ]; then - dialog_error_box "${npm_014}" "${zl_006}\n\n${ZETTLR_INFO}" else - dialog_error_box "${head_error}" "${zl_008}" + echo -e "\n=== ${zl_008} ===" fi else dialog_error_box "${head_canceled}" "${head_op_error}"