Changeset 3907 for ipk/source/system_addonmanager_2_0

Timestamp:

Sep 3, 2010, 7:53:03 PM (16 years ago)

Author:

civer

Message:

[ALL /AddonManager ]

• added new version THX BB

Location:

ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager

Files:

• backup.sh (modified) (2 diffs)
• downloader.py (modified) (5 diffs)
• restore.sh (modified) (3 diffs)

ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/backup.sh

@@ -14 +14 @@
 if [ ! -e /var/etc/restore.cfg ]; then
   # make a default and say all yes
-  settings=y
-  binarys=y
-  camconfig=y
-  plugins=y
-  network=y
-  samba=y
-  bilder=y
-  sonstige=y
+  settings=n
+  binarys=n
+  camconfig=n
+  plugins=n
+  network=n
+  samba=n
+  bilder=n
+  sonstige=n
   addonmanager=y
   backup=y
-  cp /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore* /var/etc/
+  cp /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh /var/etc/
 else
   . /var/etc/restore.cfg   # read config from Addon-Manager
@@ -246 +246 @@
 # for automatic restore after flashing
 cp /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh /var/etc/restore.sh
-cp /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.cfg /var/etc/restore.cfg
-
-# for automatic restore after flashing
+cp /var/etc/restore.cfg $DIR/restore.cfg
 cp /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh $DIR/restore.sh
 
 exit 0
-

ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py

@@ -27 +27 @@
 from Components.MultiContent import MultiContentEntryText
 from Tools.Directories import fileExists
+from Tools.Directories import pathExists
 from Screens.Console import Console
 from os import system, remove, path, walk, makedirs, listdir
@@ -97 +98 @@
 config.AddonManager2.sett_on = ConfigSelection(RestoreYesNo)
 config.AddonManager2.camconfig_on = ConfigSelection(RestoreYesNo)
-config.AddonManager2.plug_on = ConfigSelection(RestoreYesNo)
+config.AddonManager2.plug_on = ConfigSelection(RestoreNoYes)
 config.AddonManager2.binarys_on = ConfigSelection(RestoreNoYes)
 config.AddonManager2.network_on = ConfigSelection(RestoreYesNo)
@@ -463 +464 @@
                                 "2": self.bootbilder_download,
                                 "3": self.radiobilder_download,
-                                "5": self.BackupRestoreVU,
+                                "5": self.BackupRestore,
                                 "7": self.skins_download,
                                 "8": self.beta_download,
@@ -518 +519 @@
                         self.feed_download()
 
-
-
         def BackupRestoreVU(self):
+                self.session.open(RestoreConfigScreenVU)
+
+        def BackupRestore(self):
                 if self.betacode == True:
                         self.session.open(RestoreConfigScreenVU)
@@ -1639 +1641 @@
 
         def save(self):
-                config.RestoreConfig.save()
+                for x in self["config"].list:
+                                x[1].save()
+                config.save()
+                #config.RestoreConfig.save()
                 self.save_settings()
                 print "[AddonManager] RestoreConfig save"

ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh

@@ -15 +15 @@
 if [ ! -e /var/etc/restore.cfg ]; then
   # make a default and say all yes
-  settings=y
-  binarys=y
-  camconfig=y
-  plugins=y
-  network=y
-  samba=y
-  bilder=y
-  sonstige=y
+  settings=n
+  binarys=n
+  camconfig=n
+  plugins=n
+  network=n
+  samba=n
+  bilder=n
+  sonstige=n
   addonmanager=y
   backup=y
@@ -28 +28 @@
 . /var/etc/restore.cfg   # read config from Addon-Manager
 fi
+
 echo -e "***********************************************************"
 echo -e "**********Wiederherstellung VU Plus oder Dreambox**********"
@@ -52 +53 @@
 # Neustart nach Flashinstallation, restore AM
 if [ -e /var/swap/backup/.firstrun ] || [ -e /media/hdd/backup/.firstrun ] ; then
-  settings=n
-  binarys=y
-  camconfig=n
-  plugins=y
-  network=n
-  samba=n
-  bilder=n
-  sonstige=n
-  addonmanager=y
-  backup=n
+  if [ -e $DIR/restore.cfg ]; then
+    . $DIR/restore.cfg
+  else
+    settings=n
+    binarys=n
+    camconfig=n
+    plugins=n
+    network=n
+    samba=n
+    bilder=n
+    sonstige=n
+    addonmanager=y
+    backup=y
+  fi
 fi