summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp44
-rw-r--r--noncore/settings/backup/backuprestore.h1
2 files changed, 38 insertions, 7 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 6b83bc9..164055e 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -252,10 +252,11 @@ void BackupAndRestore::backup()
252 qDebug( "Storing file: %s", outputFile.latin1() ); 252 qDebug( "Storing file: %s", outputFile.latin1() );
253 outputFile += EXTENSION; 253 outputFile += EXTENSION;
254 254
255 QString commandLine = QString( "(tar -C %1 -z --exclude=*.bck -c %2 > %3 ) 2> %4" ).arg( QDir::homeDirPath() ) 255 QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() )
256 .arg( backupFiles ) 256 .arg( getExcludeFile() )
257 .arg( outputFile.latin1() ) 257 .arg( backupFiles )
258 .arg( tempFileName.latin1() ); 258 .arg( outputFile.latin1() )
259 .arg( tempFileName.latin1() );
259 260
260 qDebug( commandLine ); 261 qDebug( commandLine );
261 262
@@ -420,9 +421,9 @@ void BackupAndRestore::restore()
420 421
421 qDebug( restoreFile ); 422 qDebug( restoreFile );
422 423
423 QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) 424 QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
424 .arg( restoreFile.latin1() ) 425 .arg( restoreFile.latin1() )
425 .arg( tempFileName.latin1() ); 426 .arg( tempFileName.latin1() );
426 427
427 qDebug( commandLine ); 428 qDebug( commandLine );
428 429
@@ -477,5 +478,34 @@ void BackupAndRestore::restore()
477 setCaption(tr("Backup and Restore")); 478 setCaption(tr("Backup and Restore"));
478} 479}
479 480
481
482/**
483 * Check for exclude in Applications/backup
484 * If it does not exist, the function will create the file with *.bck as content
485 * The exclude_files is read by tar and will provide to exclude special files out from backup.
486 * e.g. alle *.bck files (backup-files) will not be backed up by default
487 */
488
489QString BackupAndRestore::getExcludeFile()
490{
491 QString excludeFileName = Global::applicationFileName( "backup", "exclude" );
492 if ( !QFile::exists( excludeFileName ) )
493 {
494 QFile excludeFile( excludeFileName);
495 if ( excludeFile.open( IO_WriteOnly ) == true )
496 {
497 QTextStream writeStream( &excludeFile );
498 writeStream << "*.bck" << "\n";
499 excludeFile.close();
500 }
501 else
502 {
503 return QString::null;
504 }
505 }
506
507 return excludeFileName;
508}
509
480// backuprestore.cpp 510// backuprestore.cpp
481 511
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index fdc2bf2..0d88f8d 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -31,6 +31,7 @@ private slots:
31private: 31private:
32 void scanForApplicationSettings(); 32 void scanForApplicationSettings();
33 int getBackupFiles(QString &backupFiles, QListViewItem *parent); 33 int getBackupFiles(QString &backupFiles, QListViewItem *parent);
34 QString getExcludeFile();
34 QMap<QString, QString> backupLocations; 35 QMap<QString, QString> backupLocations;
35 QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); 36 QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list);
36 37