diff --git a/data/scripts/backup.sh b/data/scripts/backup.sh index d9998007e..2ab6bcf7e 100755 --- a/data/scripts/backup.sh +++ b/data/scripts/backup.sh @@ -24,4 +24,4 @@ TOBACKUP=$(echo $RES) echo Backup to $1/settings_$DATE.tar -tar -cf $1/settings_$DATE.tar $TOBACKUP +tar -cf $1/settings_$DATE.tar $TOBACKUP 2>&1 >/dev/null diff --git a/src/nhttpd/web/Y_Settings_Backup.yhtm b/src/nhttpd/web/Y_Settings_Backup.yhtm index 02f908e1d..4977afef7 100644 --- a/src/nhttpd/web/Y_Settings_Backup.yhtm +++ b/src/nhttpd/web/Y_Settings_Backup.yhtm @@ -36,27 +36,28 @@ function do_backup2() {=var-set:wait_text=Settings=}{=include-block:Y_Blocks.txt;snip_wait=}
- {=var-set:help_url=Help-Settings-Backup_Restore=}{=var-set:menu=Backup & Restore=}{=include-block:Y_Blocks.txt;work_menu=}
+ {=var-set:help_url=Help-Settings-Backup_Restore=}{=var-set:menu={=L:set.menue.backup_restore=}=}{=include-block:Y_Blocks.txt;work_menu=}
-

-  Achtung Backup & Restore ist nur bei einem gleichen Image mit gleichem Stand sinnvoll. -

-
+

+ + {=L:attention=} {=L:set.settings.warning=} +

- + - - + diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 2b61fb0c8..31aa65324 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -53,6 +53,7 @@ function init(){ {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:set.menue.boot_logo=}
    • ~=} +
  • {=L:set.menue.backup_restore=}
  • {=L:set.menue.timer_settings=}
    • ~
  • yWeb
    • @@ -61,9 +62,7 @@ function init(){ {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:set.menue.boot_logo=}
    • ~=} - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
  • {=L:set.menue.backup_restore=}
    • - ~=}
  • {=L:set.menue.timer_settings=}
    • =} diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index f422477b8..27b7e08d4 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -49,7 +49,8 @@ tag=Bezeichnung empty=leer check=prüfen help=Hilfe -restriced_by_management_ip=Zugriff verwert wg. ManagementIP +attention=Achtung! +restriced_by_management_ip=Zugriff verwehrt wg. ManagementIP # ==========Main Menue main.boxcontrol=Boxsteuerung @@ -373,6 +374,13 @@ set.timer.klack.security_code_desc=Klack Sicherheits Code set.timer.klack.security_code=Sicherheits Code set.timer.channel_name_replacelist=Sendernamen-Ersetzungsliste +========Settings Backup/Restore +set.settings.backup=Sichern +set.settings.backup_desc=Sichern Ihrer Einstellungen +set.settings.restore=Wiederherstellen +set.settings.restore_desc=Hochladen und wiederherstellen einer vorher erstellten Sicherung. Ihre Box startet danach neu. +set.settings.warning=Sichern & Wiederherstellen ist nur bei einem gleichen Image mit gleichem Entwicklungsstand sinnvoll. + ============ Tools Info tools.info.show_messages=Kernel Meldungen tools.info.processes=Prozesse diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index be48ce32c..3d8803063 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -49,6 +49,7 @@ tag=Tag empty=empty check=check help=Help +attention=Attention! restriced_by_management_ip=restricted by ManagementIP #========= MAIN Menue @@ -376,6 +377,13 @@ set.timer.klack.security_code_desc=your klack security code to get your data wit set.timer.klack.security_code=Security Code set.timer.channel_name_replacelist=Channel name replace list +========Settings Backup/Restore +set.settings.backup=Backup +set.settings.backup_desc=Backup your settings +set.settings.restore=Restore +set.settings.restore_desc=Upload and restore your settings. Your STB will reboot. +set.settings.warning=Backup & Restore is only useful for the same image with the same level of development. + ============ Tools Info tools.info.show_messages=Kernel Messages tools.info.processes=Processes diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese index d098e8bae..36cb93211 100644 --- a/src/nhttpd/web/languages/Portuguese +++ b/src/nhttpd/web/languages/Portuguese @@ -49,6 +49,7 @@ tag=Tag empty=vazio check=verificar help=Ajuda +attention=Attention! restriced_by_management_ip=restringido pela Gestão de IP #========= Menu Principal @@ -371,6 +372,13 @@ set.ap.decode_priority=Prioridade de decodificação set.ap.start_dir=Diretório de Início set.ap.parse_shoutcast=Shoutcast Meta-Data +========Settings Backup/Restore +set.settings.backup=Backup +set.settings.backup_desc=Backup your settings +set.settings.restore=Restore +set.settings.restore_desc=Upload and restore your settings. Your STB will reboot. +set.settings.warning=Backup & Restore is only useful for the same image with the same level of development. + ============ Ferramentas de Informação tools.info.show_messages=Mensagens do Kernel tools.info.processes=Processos diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh index a89ed914f..dd26fece1 100755 --- a/src/nhttpd/web/scripts/Y_Tools.sh +++ b/src/nhttpd/web/scripts/Y_Tools.sh @@ -486,35 +486,25 @@ do_fbshot_clear() # ----------------------------------------------------------- do_settings_backup_restore() { - workdir="$y_path_tmp/y_save_settings" - yI_Version="0.1" + now=$(date +%Y-%m-%d_%H-%M-%S) + workdir="$y_path_tmp/y_save_settings/$now" case "$1" in backup) - mkdir $workdir >/dev/null - cp -r $y_path_config $workdir >/dev/null - t=`date +%y%m%d_%H%M%S` - filename="$y_path_tmp/y_Save_Settings_$t.tar" - cd $workdir - tar -cvf $filename ./* >/dev/null - rm -r $workdir >/dev/null - echo "$filename" + rm -rf $workdir + mkdir -p $workdir + /bin/backup.sh $workdir >/dev/null + filename=$(ls -1 -tr $workdir/settings_* | tail -1) + echo "$filename" ;; restore) - msg="restore settings" - if [ -s "$y_upload_file" ] - then - # unpack /tmp/upload.tmp - cd $y_path_tmp - tar -xf "$y_upload_file" - rm $y_upload_file - cp -rf ./config /var/tuxbox/ - rm -r ./config - msg="$msg ok" - else - msg="$msg error: no upload file" - fi - y_format_message_html + if [ -s "$y_upload_file" ] + then + msg=$(/bin/restore.sh "$y_upload_file") + else + msg="error: no upload file" + fi + y_format_message_html ;; esac }
    Backup
    {=L:set.settings.backup=}
    - + + +
    Restore
    {=L:set.settings.restore=}
    tar-File:  
    - +