RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skipping re-exec for when git repo is already up to date

This commit is contained in:
Anton Hvornum 2019-04-11 21:26:43 +02:00
parent dd0f2f9d56
commit fdf01f0cf6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archinstall.py
View File

@ -173,6 +173,7 @@ class sys_command():
exit_code = os.waitpid(self.pid, 0)[1] exit_code = os.waitpid(self.pid, 0)[1]
if exit_code != 0: if exit_code != 0:
print('[E] Command "{}" exited with status code:'.format(self.cmd[0]), exit_code) print('[E] Command "{}" exited with status code:'.format(self.cmd[0]), exit_code)
exit(1)
def simple_command(cmd, opts=None, *args, **kwargs): def simple_command(cmd, opts=None, *args, **kwargs):
if not opts: opts = {} if not opts: opts = {}
@ -206,22 +207,22 @@ def update_git():
os.remove('/root/archinstall/README.md') os.remove('/root/archinstall/README.md')
output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2); git pull)') output = simple_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2); git pull)')
print(output)
if b'error:' in output: if b'error:' in output:
print('[N] Could not update git source for some reason.') print('[N] Could not update git source for some reason.')
return return
# b'From github.com:Torxed/archinstall\n 339d687..80b97f3 master -> origin/master\nUpdating 339d687..80b97f3\nFast-forward\n README.md | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n' # b'From github.com:Torxed/archinstall\n 339d687..80b97f3 master -> origin/master\nUpdating 339d687..80b97f3\nFast-forward\n README.md | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n'
tmp = re.findall(b'[0-9]+ file changed', output) if not b'Already up to date' in output:
print(tmp) tmp = re.findall(b'[0-9]+ file changed', output)
if len(tmp): print(tmp)
num_changes = int(tmp[0].split(b' ',1)[0]) if len(tmp):
if(num_changes): num_changes = int(tmp[0].split(b' ',1)[0])
## Reboot the script (in same context) if(num_changes):
print('[N] Rebooting the script') ## Reboot the script (in same context)
os.execv('/usr/bin/python3', ['archinstall.py'] + sys.argv) print('[N] Rebooting the script')
extit(1) os.execv('/usr/bin/python3', ['archinstall.py'] + sys.argv)
extit(1)
def device_state(name): def device_state(name):
# Based out of: https://askubuntu.com/questions/528690/how-to-get-list-of-all-non-removable-disk-device-names-ssd-hdd-and-sata-ide-onl/528709#528709 # Based out of: https://askubuntu.com/questions/528690/how-to-get-list-of-all-non-removable-disk-device-names-ssd-hdd-and-sata-ide-onl/528709#528709