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

More git update experiments

This commit is contained in:
Anton Hvornum 2019-04-11 21:05:36 +02:00
parent c33d382220
commit f11d93e255
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archinstall.py
View File

@ -137,7 +137,7 @@ class sys_command():
def exec(self): def exec(self):
if not self.cmd[0][0] == '/': if not self.cmd[0][0] == '/':
print('[N] Command is not executed with absolute path, trying to find it..') print('[N] Command is not executed with absolute path, trying to find it..')
o = b''.join(sys_command('/usr/bin/whereis {}'.format(self.cmd[0]))) o = b''.join(sys_command('/usr/bin/whereis {}'.format(self.cmd[0])).exec())
self.cmd[0] = o.split(b' ', 1)[0].decode('UTF-8') self.cmd[0] = o.split(b' ', 1)[0].decode('UTF-8')
print('[N] This is what I\'m going with: {}'.format(self.cmd[0])) print('[N] This is what I\'m going with: {}'.format(self.cmd[0]))
# PID = 0 for child, and the PID of the child for the parent # PID = 0 for child, and the PID of the child for the parent
@ -204,7 +204,7 @@ def update_git():
os.remove('/root/archinstall/archinstall.py') os.remove('/root/archinstall/archinstall.py')
os.remove('/root/archinstall/README.md') os.remove('/root/archinstall/README.md')
output = b''.join(sys_command('(cd /root/archinstall; git update)').exec()) # git reset --hard origin/<branch_name> / git fetch --all output = b''.join(sys_command('(cd /root/archinstall; git reset --hard origin/$(git branch | grep "*" | cut -d\' \' -f 2))').exec()) # git reset --hard origin/<branch_name> / git fetch --all
print(output) print(output)
if b'error:' in output: if b'error:' in output:
@ -220,6 +220,7 @@ def update_git():
## Reboot the script (in same context) ## Reboot the script (in same context)
print('[N] Rebooting the script') print('[N] Rebooting the script')
os.execv('/usr/bin/python3', ['archinstall.py'] + sys.argv) 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