chromiumアンインストールのタイミング変更

diff --git a/src/Items.py b/src/Items.py
index c6fc0d3..7d6848f 100755 (executable)
--- a/src/Items.py
+++ b/src/Items.py
@@ -104,6 +104,7 @@ class Chrome(Item) :
             if cmresult is None :
                 return None
             elif cmresult :
+                Chromium.uninstalled = True
                 return (True, ("Installing " + self.name, self.execute), cmresult)
             else :
                 return ("Installing " + self.name, self.execute)
@@ -155,47 +156,62 @@ class Chrome(Item) :
             else :
                 return
 
-
-class Chromium(Item) :
+class Firefox(Item) :
     
     def __init__(self, _interface) :
-        
         super().__init__(_interface)
-        self.name = "Chromium"
-        self.execute_src = self.PATH + "/../scripts/chromiumuninstall.sh"
-        self.restore_src = self.PATH + "/../scripts/chromiuminstall.sh"
+
+        self.name = "Firefox"
+        self.execute_src = self.PATH + "/../scripts/firefoxinstall.sh"
+        self.restore_src = self.PATH + "/../scripts/firefoxuninstall.sh"
 
 
-    def first_time(self) : 
+    def first_time(self) :
 
-        result =  self.interface.yesnoback("Do you want to uninstall {}?".format(self.name)) 
+        result =  self.interface.yesnoback("Do you want to install {}?".format(self.name))
 
         if result is None :
             return None
+
         elif result :
-            return ("Uninstalling " + self.name, self.execute)
+
+            if not Chromium.uninstalled :
+                chromium = Chromium(self.interface)
+                cmresult = chromium.first_time()
+
+            else :
+                cmresult = False
+
+            if cmresult is None :
+                return None
+            elif cmresult :
+                return (True, ("Installing " + self.name, self.execute), cmresult)
+            else :
+                return ("Installing " + self.name, self.execute)
+
         else :
             return False
 
     def isdefault(self) :
-        
-        subprocess.call([self.PATH + "/../scripts/isinstalled.sh", "chromium-browser"])
-        return not super().isdefault("chromium-browser")
+
+        subprocess.call([self.PATH + "/../scripts/isinstalled.sh", "firefox"])
+        return super().isdefault("firefox")
+
 
     def show(self) :
-       
+
         if self.isdefault() :
-            self.interface.show("Chromium                : installed") 
+            self.interface.show("Firefox                 : not installed ")
         else :
-            self.interface.show("Chromium                : not installed")
+            self.interface.show("Firefox                 : installed")
+
 
-    
     def change(self) :
 
         if self.isdefault() :
             
-            str = ("{} is installed.\n".format(self.name),
-                   "Do you want to uninstall {}?".format(self.name))
+            str = ("{} is not installed.\n".format(self.name),
+                   "Do you want to install {}?".format(self.name))
             
             result = self.interface.yesnoback(str) 
 
@@ -208,8 +224,8 @@ class Chromium(Item) :
 
         else :
             
-            str = ("{} is not installed.\n".format(self.name),
-                   "Do you want to install {}?".format(self.name))
+            str = ("{} is installed.\n".format(self.name),
+                   "Do you want to uninstall {}?".format(self.name))
             
             result = self.interface.yesnoback(str)
 
@@ -221,45 +237,48 @@ class Chromium(Item) :
                 return
 
 
-class Firefox(Item) :
+class Chromium(Item) :
+    
+    uninstalled = False
     
     def __init__(self, _interface) :
         
         super().__init__(_interface)
-        self.name = "Firefox"
-        self.execute_src = self.PATH + "/../scripts/firefoxinstall.sh"
-        self.restore_src = self.PATH + "/../scripts/firefoxuninstall.sh"
+        self.name = "Chromium"
+        self.execute_src = self.PATH + "/../scripts/chromiumuninstall.sh"
+        self.restore_src = self.PATH + "/../scripts/chromiuminstall.sh"
 
 
     def first_time(self) : 
 
-        result =  self.interface.yesnoback("Do you want to install {}?".format(self.name)) 
+        result =  self.interface.yesnoback("Do you want to uninstall {}?".format(self.name)) 
+
         if result is None :
             return None
         elif result :
-            return ("Installing " + self.name, self.execute)
+            return ("Uninstalling " + self.name, self.execute)
         else :
             return False
 
     def isdefault(self) :
         
-        subprocess.call([self.PATH + "/../scripts/isinstalled.sh", "firefox"])
-        return super().isdefault("firefox")
+        subprocess.call([self.PATH + "/../scripts/isinstalled.sh", "chromium-browser"])
+        return not super().isdefault("chromium-browser")
 
     def show(self) :
        
         if self.isdefault() :
-            self.interface.show("Firefox                 : not installed") 
+            self.interface.show("Chromium                : installed") 
         else :
-            self.interface.show("Firefox                 : installed")
+            self.interface.show("Chromium                : not installed")
 
     
     def change(self) :
 
         if self.isdefault() :
             
-            str = ("{} is not installed.\n".format(self.name),
-                   "Do you want to install {}?".format(self.name))
+            str = ("{} is installed.\n".format(self.name),
+                   "Do you want to uninstall {}?".format(self.name))
             
             result = self.interface.yesnoback(str) 
 
@@ -272,8 +291,8 @@ class Firefox(Item) :
 
         else :
             
-            str = ("{} is installed.\n".format(self.name),
-                   "Do you want to uninstall {}?".format(self.name))
+            str = ("{} is not installed.\n".format(self.name),
+                   "Do you want to install {}?".format(self.name))
             
             result = self.interface.yesnoback(str)
 
@@ -285,6 +304,7 @@ class Firefox(Item) :
                 return
 
 
+
 class FFmpeg(Item) :
     
     def __init__(self, _interface) :