2025-02-05T07:17:22Z

Author: wrmsr

omdev/oci/tars.py

@@ -65,7 +65,7 @@ def tell(self) -> int:
             return self._f.tell()
 
     _cw: _FileWrapper
-    _cf: gzip.GzipFile
+    _cf: ta.BinaryIO
 
     _tw: _FileWrapper
     _tf: tarfile.TarFile
@@ -129,7 +129,7 @@ def add_file(self, ti: tarfile.TarInfo, f: ta.Optional[ta.BinaryIO] = None) -> N
         self._tf.addfile(ti, f)
 
 
-def write_oci_data_tar_gz_file(
+def write_oci_data_tar_file(
         f: ta.BinaryIO,
         data: ta.Mapping[str, OciDataRef],
 ) -> WrittenOciDataTarFileInfo:

omdev/pyproject/resources/python.sh

@@ -2,7 +2,7 @@
 set -e
 
 if [ -z "${VENV}" ] ; then
-    if [ $(uname) = "Linux" ] && (cat /proc/mounts | grep -E '^overlay / .*/(docker|desktop-containerd)/' > /dev/null) ; then
+    if [ $(uname) = "Linux" ] && grep -E '^overlay / .*/(docker|desktop-containerd)/' /proc/mounts > /dev/null ; then
         VENV=docker
     else
         VENV=default

python

@@ -2,7 +2,7 @@
 set -e
 
 if [ -z "${VENV}" ] ; then
-    if [ $(uname) = "Linux" ] && (cat /proc/mounts | grep -E '^overlay / .*/(docker|desktop-containerd)/' > /dev/null) ; then
+    if [ $(uname) = "Linux" ] && grep -E '^overlay / .*/(docker|desktop-containerd)/' /proc/mounts > /dev/null ; then
         VENV=docker
     else
         VENV=default