1 files changed, 21 insertions, 4 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
@@ -252,7 +252,7 @@ void BackupAndRestore::backup()
     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() )
@@ -421,14 +421,32 @@ void BackupAndRestore::restore()
 
     qDebug( restoreFile );
 
-    QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
+    //check if backup file come from opie 1.0.x
+
+    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 );
 
-    int r = system( commandLine );
+    r = system( commandLine );
 
+    //error handling
     if(r != 0)
     {
         QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
@@ -478,7 +496,6 @@ 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