removed unnecessary "!= 0"
This commit is contained in:
parent
dc8485d2db
commit
59ab76c21b
2 changed files with 12 additions and 16 deletions
18
setup.py
18
setup.py
|
@ -22,9 +22,8 @@ def minimal_check():
|
||||||
# check if OS is linux and if pacman exists
|
# check if OS is linux and if pacman exists
|
||||||
#
|
#
|
||||||
|
|
||||||
if (
|
if "linux" not in sys.platform.lower() or os.system(
|
||||||
"linux" not in sys.platform.lower()
|
"command -v pacman &> /dev/null"
|
||||||
or os.system("command -v pacman &> /dev/null") != 0
|
|
||||||
):
|
):
|
||||||
print("This script should only be used on arch linux.", file=sys.stderr)
|
print("This script should only be used on arch linux.", file=sys.stderr)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
@ -42,7 +41,7 @@ def minimal_check():
|
||||||
# check if there's internet connection
|
# check if there's internet connection
|
||||||
#
|
#
|
||||||
|
|
||||||
if os.system("ping -c 1 archlinux.org &> /dev/null") != 0:
|
if os.system("ping -c 1 archlinux.org &> /dev/null"):
|
||||||
print("Failed to connect to internet.", file=sys.stderr)
|
print("Failed to connect to internet.", file=sys.stderr)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
@ -57,7 +56,7 @@ def minimal_initialization():
|
||||||
# Install git
|
# Install git
|
||||||
#
|
#
|
||||||
|
|
||||||
if os.system("command -v git &> /dev/null") != 0:
|
if os.system("command -v git &> /dev/null"):
|
||||||
print("git was not installed already. Installing now.")
|
print("git was not installed already. Installing now.")
|
||||||
os.system("sudo pacman -S --noconfirm --needed git")
|
os.system("sudo pacman -S --noconfirm --needed git")
|
||||||
|
|
||||||
|
@ -72,17 +71,14 @@ def minimal_initialization():
|
||||||
rmtree(tmp_dir)
|
rmtree(tmp_dir)
|
||||||
|
|
||||||
# todo: change branch to master when merging with master
|
# todo: change branch to master when merging with master
|
||||||
if (
|
if os.system(
|
||||||
os.system(
|
f"git clone --depth 1 -b dev https://github.com/developomp/setup.git {tmp_dir} &> /dev/null"
|
||||||
f"git clone --depth 1 -b dev https://github.com/developomp/setup.git {tmp_dir} &> /dev/null"
|
|
||||||
)
|
|
||||||
!= 0
|
|
||||||
):
|
):
|
||||||
print("Failed to clone repository", file=sys.stderr)
|
print("Failed to clone repository", file=sys.stderr)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
# allow everyone to read and write but not execute.
|
# allow everyone to read and write but not execute.
|
||||||
if os.system(f"chmod -R a+rw {tmp_dir}") != 0:
|
if os.system(f"chmod -R a+rw {tmp_dir}"):
|
||||||
print("Failed to change file permission for cloned repo", file=sys.stderr)
|
print("Failed to change file permission for cloned repo", file=sys.stderr)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
from . import log
|
||||||
|
|
||||||
|
|
||||||
def initialize():
|
def initialize():
|
||||||
"""
|
"""
|
||||||
- install [pytermgui](https://github.com/bczsalba/pytermgui)
|
- install [pytermgui](https://github.com/bczsalba/pytermgui)
|
||||||
- install pip
|
- install pip
|
||||||
- install flatpak
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
#
|
|
||||||
# Install flatpak
|
# Install flatpak
|
||||||
#
|
if os.system("sudo pacman -S --noconfirm --needed flatpak"):
|
||||||
|
log.error("Failed to install flatpak")
|
||||||
os.system("sudo pacman -S --noconfirm --needed flatpak")
|
exit(1)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue