| -rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 87b7966..58e5c71 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -251,9 +251,9 @@ void BackupAndRestore::backup() // for debugging.. qDebug( "Storing file: %s", outputFile.latin1() ); outputFile += EXTENSION; - QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) + QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) .arg( getExcludeFile() ) .arg( backupFiles ) .arg( outputFile.latin1() ) .arg( tempFileName.latin1() ); @@ -420,16 +420,34 @@ void BackupAndRestore::restore() restoreFile += "/" + restoreItem->text(0); qDebug( restoreFile ); - QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) - .arg( restoreFile.latin1() ) - .arg( tempFileName.latin1() ); + //check if backup file come from opie 1.0.x - qDebug( commandLine ); + QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() ); int r = system( commandLine ); + QString startDir; + + if( r != 0 ) //Applications/backup/exclude not found - old backup file + { + startDir = QString( "/" ); + } else + { + startDir = QDir::homeDirPath(); + } + + //unpack backup file + commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir ) + .arg( restoreFile.latin1() ) + .arg( tempFileName.latin1() ); + + qDebug( commandLine ); + + r = system( commandLine ); + + //error handling if(r != 0) { QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" @@ -477,9 +495,8 @@ void BackupAndRestore::restore() setCaption(tr("Backup and Restore")); } - /** * Check for exclude in Applications/backup * If it does not exist, the function will create the file with *.bck as content * The exclude_files is read by tar and will provide to exclude special files out from backup. |