askiiart-blendos/blend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup and minor bug fixes

Browse source
This commit is contained in:
askiiart 2024-11-07 16:31:46 -06:00
parent 321f9d9399
commit 5800446122
Signed by untrusted user who does not match committer: askiiart
GPG key ID: EA85979611654C30
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
blend
View file

@ -19,7 +19,6 @@
import os import os
import sys import sys
import glob
import time import time
import shutil import shutil
import socket import socket
@ -129,7 +128,7 @@ def check_container(name):
def check_container_status(name): def check_container_status(name):
if os.environ.get('SUDO_USER') == None: if os.environ.get('SUDO_USER'):
return host_get_output("podman inspect --type container " + name + " --format \"{{.State.Status}}\"") return host_get_output("podman inspect --type container " + name + " --format \"{{.State.Status}}\"")
else: else:
return host_get_output(f"sudo -u {os.environ.get('SUDO_USER')} podman inspect --type container " + name + " --format \"{{.State.Status}}\"") return host_get_output(f"sudo -u {os.environ.get('SUDO_USER')} podman inspect --type container " + name + " --format \"{{.State.Status}}\"")
@ -137,7 +136,7 @@ def check_container_status(name):
def core_start_container(name, new_container=False): def core_start_container(name, new_container=False):
sudo = [] sudo = []
if os.environ.get('SUDO_USER') != None: if os.environ.get('SUDO_USER'):
sudo = ['sudo', '-u', os.environ.get('SUDO_USER')] sudo = ['sudo', '-u', os.environ.get('SUDO_USER')]
subprocess.call([*sudo, 'podman', 'start', name], subprocess.call([*sudo, 'podman', 'start', name],
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
@ -150,7 +149,7 @@ def core_start_container(name, new_container=False):
subprocess.call(['podman', 'logs', '--since', str(start_time), name]) subprocess.call(['podman', 'logs', '--since', str(start_time), name])
exit(1) exit(1)
if os.environ.get('SUDO_USER') == None: if not os.environ.get('SUDO_USER'):
logproc = pexpect.spawn( logproc = pexpect.spawn(
'podman', args=['logs', '-f', '--since', str(start_time), name], timeout=3600) 'podman', args=['logs', '-f', '--since', str(start_time), name], timeout=3600)
else: else:
@ -393,7 +392,7 @@ def enter_container():
podman_args = ['--env', 'LC_ALL=C.UTF-8'] podman_args = ['--env', 'LC_ALL=C.UTF-8']
sudo = [] sudo = []
if os.environ.get('SUDO_USER') == None: if not os.environ.get('SUDO_USER'):
podman_args = ['--user', getpass.getuser()] podman_args = ['--user', getpass.getuser()]
else: else:
sudo = ['sudo', '-u', os.environ.get( sudo = ['sudo', '-u', os.environ.get(
@ -402,7 +401,7 @@ def enter_container():
if name not in ['LANG', 'LC_CTYPE', 'LC_ALL', 'PATH', 'HOST', 'HOSTNAME', 'SHELL'] and not name.startswith('_'): if name not in ['LANG', 'LC_CTYPE', 'LC_ALL', 'PATH', 'HOST', 'HOSTNAME', 'SHELL'] and not name.startswith('_'):
podman_args.append('--env') podman_args.append('--env')
podman_args.append(name + '=' + val) podman_args.append(name + '=' + val)
if os.environ.get('BLEND_COMMAND') == None or os.environ.get('BLEND_COMMAND') == '': if not os.environ.get('BLEND_COMMAND'):
if args.pkg == []: if args.pkg == []:
if os.getcwd() == os.path.expanduser('~') or os.getcwd().startswith(os.path.expanduser('~') + '/'): if os.getcwd() == os.path.expanduser('~') or os.getcwd().startswith(os.path.expanduser('~') + '/'):
exit(subprocess.call([*sudo, 'podman', 'exec', *podman_args, exit(subprocess.call([*sudo, 'podman', 'exec', *podman_args,