gap_workspace_file: use GAP_LIB_DIR and GAP_SHARE_DIR

Author: tornaria

src/sage/interfaces/gap_workspace.py

@@ -17,7 +17,7 @@
 import time
 import hashlib
 import subprocess
-from sage.env import DOT_SAGE, SAGE_LOCAL, HOSTNAME, GAP_ROOT_DIR
+from sage.env import DOT_SAGE, HOSTNAME, GAP_LIB_DIR, GAP_SHARE_DIR
 
 
 def gap_workspace_file(system="gap", name="workspace", dir=None):
@@ -60,12 +60,13 @@ def gap_workspace_file(system="gap", name="workspace", dir=None):
     if dir is None:
         dir = os.path.join(DOT_SAGE, 'gap')
 
-    data = SAGE_LOCAL
-    sysinfo = os.path.join(GAP_ROOT_DIR, "sysinfo.gap")
-    if os.path.exists(sysinfo):
-        data += subprocess.getoutput(f'. "{sysinfo}" && echo ":$GAP_VERSION:$GAParch"')
+    data = f'{GAP_LIB_DIR}:{GAP_SHARE_DIR}'
+    for path in GAP_LIB_DIR, GAP_SHARE_DIR:
+        sysinfo = os.path.join(path, "sysinfo.gap")
+        if os.path.exists(sysinfo):
+            data += subprocess.getoutput(f'. "{sysinfo}" && echo ":$GAP_VERSION:$GAParch"')
     h = hashlib.sha1(data.encode('utf-8')).hexdigest()
-    return os.path.join(dir, '%s-%s-%s-%s' % (system, name, HOSTNAME, h))
+    return os.path.join(dir, f'{system}-{name}-{HOSTNAME}-{h}')
 
 
 def prepare_workspace_dir(dir=None):