author | ar <ar> | 2004-03-06 22:30:09 (UTC) |
---|---|---|
committer | ar <ar> | 2004-03-06 22:30:09 (UTC) |
commit | 5bc69a9731634c55b9a01b9de6909201f422893b (patch) (side-by-side diff) | |
tree | 94eb378dfc4da7f9ecb2052ca0ffffdb8721ff8f /noncore | |
parent | b5466f18b49d5f99237fdd6b39e0f61609557698 (diff) | |
download | opie-5bc69a9731634c55b9a01b9de6909201f422893b.zip opie-5bc69a9731634c55b9a01b9de6909201f422893b.tar.gz opie-5bc69a9731634c55b9a01b9de6909201f422893b.tar.bz2 |
fix to work together with busybox tar
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 44 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 1 |
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 @@ -251,12 +251,13 @@ void BackupAndRestore::backup() // for debugging.. qDebug( "Storing file: %s", outputFile.latin1() ); outputFile += EXTENSION; - QString commandLine = QString( "(tar -C %1 -z --exclude=*.bck -c %2 > %3 ) 2> %4" ).arg( QDir::homeDirPath() ) - .arg( backupFiles ) - .arg( outputFile.latin1() ) - .arg( tempFileName.latin1() ); + QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) + .arg( getExcludeFile() ) + .arg( backupFiles ) + .arg( outputFile.latin1() ) + .arg( tempFileName.latin1() ); qDebug( commandLine ); int r = system( commandLine ); @@ -419,11 +420,11 @@ void BackupAndRestore::restore() restoreFile += "/" + restoreItem->text(0); qDebug( restoreFile ); - QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) - .arg( restoreFile.latin1() ) - .arg( tempFileName.latin1() ); + QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) + .arg( restoreFile.latin1() ) + .arg( tempFileName.latin1() ); qDebug( commandLine ); int r = system( commandLine ); @@ -476,6 +477,35 @@ 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. + * e.g. alle *.bck files (backup-files) will not be backed up by default + */ + +QString BackupAndRestore::getExcludeFile() +{ + QString excludeFileName = Global::applicationFileName( "backup", "exclude" ); + if ( !QFile::exists( excludeFileName ) ) + { + QFile excludeFile( excludeFileName); + if ( excludeFile.open( IO_WriteOnly ) == true ) + { + QTextStream writeStream( &excludeFile ); + writeStream << "*.bck" << "\n"; + excludeFile.close(); + } + else + { + return QString::null; + } + } + + return excludeFileName; +} + // backuprestore.cpp 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 @@ -30,8 +30,9 @@ private slots: private: void scanForApplicationSettings(); int getBackupFiles(QString &backupFiles, QListViewItem *parent); + QString getExcludeFile(); QMap<QString, QString> backupLocations; QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); QListViewItem *systemSettings; |