fix to work together with busybox tar

2 files changed, 33 insertions, 2 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
@@ -247,17 +247,18 @@ void BackupAndRestore::backup()
     }
 
     // We execute tar and compressing its output with gzip..
     // The error output will be written into a temp-file which could be provided
     // 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() )
+    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 );
 
@@ -415,17 +416,17 @@ void BackupAndRestore::restore()
     setCaption(tr("Backup and Restore... working..."));
 
     QString restoreFile = backupLocations[restoreSource->currentText()];
 
     restoreFile += "/" + restoreItem->text(0);
 
     qDebug( restoreFile );
 
-    QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
+    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 );
 
     if(r != 0)
@@ -472,10 +473,39 @@ void BackupAndRestore::restore()
     //write restore-location
     Config config( "BackupAndRestore" );
     config.setGroup( "LastLocation" );
     config.writeEntry( "LastRestoreLocation", restoreSource->currentText() );
 
     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
@@ -26,16 +26,17 @@ private slots:
     void selectItem(QListViewItem *currentItem);
     void sourceDirChanged(int);
     void rescanFolder(QString directory);
     void fileListUpdate();
 
 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;
     QListViewItem *applicationSettings;
     QListViewItem *documents;
 
 };