Improve install.py script to attempt to detect when /tmp/ is noexec (#172)

* Improve install.py script to attempt to detect when /tmp/ is noexec

* Add test to install from python script at HEAD

* Remove incorrect duplicated line

* Delete the tmp hishtory-client download since it may be dropped in CWD rather than /tmp/
This commit is contained in:
David Dworken
2024-02-09 17:41:52 -08:00
parent cd6b46ab66
commit ae5edb7d3e
2 changed files with 51 additions and 2 deletions

View File

@ -31,8 +31,20 @@ else:
with urllib.request.urlopen(download_url) as response:
hishtory_binary = response.read()
tmpdir = os.environ.get('TMPDIR', '') or '/tmp/'
tmpFilePath = tmpdir+'hishtory-client'
def get_executable_tmpdir():
specified_dir = os.environ.get('TMPDIR', '')
if specified_dir:
return specified_dir
try:
if hasattr(os, 'ST_NOEXEC'):
if os.statvfs("/tmp").f_flag & os.ST_NOEXEC:
# /tmp/ is mounted as NOEXEC, so fall back to the current working directory
return os.getcwd()
except:
pass
return "/tmp/"
tmpFilePath = os.path.join(get_executable_tmpdir(), 'hishtory-client')
if os.path.exists(tmpFilePath):
os.remove(tmpFilePath)
with open(tmpFilePath, 'wb') as f:
@ -44,4 +56,5 @@ if os.environ.get('HISHTORY_OFFLINE'):
exitCode = os.system(cmd)
if exitCode != 0:
raise Exception("failed to install downloaded hishtory client via `" + tmpFilePath +" install` (is that directory mounted noexec? Consider setting an alternate directory via the TMPDIR environment variable)!")
os.remove(tmpFilePath)
print('Succesfully installed hishtory! Open a new terminal, try running a command, and then running `hishtory query`.')