Setup: Oracle Linux 8 blues (RedisJSON#640)

rafie · web-flow · commit 131f7794512c · 2022-02-02T09:25:44.000+02:00
diff --git a/sbin/system-setup.py b/sbin/system-setup.py
@@ -13,31 +13,26 @@
 #----------------------------------------------------------------------------------------------
 
 class RedisJSONSetup(paella.Setup):
-    def __init__(self, nop=False):
-        paella.Setup.__init__(self, nop)
+    def __init__(self, args):
+        paella.Setup.__init__(self, args.nop)
 
     def common_first(self):
         self.install_downloaders()
-        self.install("unzip")
-        self.pip_install("wheel")
-        self.pip_install("setuptools --upgrade")
-
-        self.install("git rsync")
+        self.run("%s/bin/enable-utf8" % READIES, sudo=self.os != 'macos')
+        self.install("git unzip rsync")
 
+        if self.osnick == 'ol8':
+            self.install("tar")
         if not self.has_command("clang"):
             self.run("%s/bin/getclang --modern" % READIES)
         if not self.has_command("rustc"):
             self.run("%s/bin/getrust" % READIES)
-        self.run("%s/bin/getcmake" % READIES)
+        self.run("%s/bin/getcmake --usr" % READIES)
 
     def debian_compat(self):
-        self.run("%s/bin/enable-utf8" % READIES)
         self.run("%s/bin/getgcc" % READIES)
 
     def redhat_compat(self):
-        if self.osnick == 'ol8':
-            self.install("tar")
-        self.run("%s/bin/enable-utf8" % READIES)
         self.install("redhat-lsb-core")
         self.run("%s/bin/getgcc --modern" % READIES)
 
@@ -50,10 +45,10 @@ def macos(self):
         self.run("%s/bin/getgcc" % READIES)
 
     def common_last(self):
-        self.run("python3 %s/bin/getrmpytools" % READIES)
+        self.run("{PYTHON} {READIES}/bin/getrmpytools".format(PYTHON=self.python, READIES=READIES))
         self.pip_install("-r %s/tests/pytest/requirements.txt" % ROOT)
         self.pip_install("toml")
-        self.pip_install("awscli")
+        self.pip_install("pudb awscli")
         self.pip_install("gevent")
 
 #----------------------------------------------------------------------------------------------
@@ -62,4 +57,4 @@ def common_last(self):
 parser.add_argument('-n', '--nop', action="store_true", help='no operation')
 args = parser.parse_args()
 
-RedisJSONSetup(nop = args.nop).setup()
+RedisJSONSetup(args).setup()
