1
0
Fork 0

fixed broken logic

- changed `tmp_dir` in `src/constants` to `content_dir`
- fixed `src.constants.content_dir` not changing
This commit is contained in:
Kim, Jimin 2022-03-17 18:03:40 +09:00
parent 6db55b5a8e
commit c0ab0e4392
9 changed files with 28 additions and 27 deletions

View file

@ -1,2 +1,4 @@
# must be synced with `setup.py`
tmp_dir = "/tmp/com.developomp.setup"
# this variable may be altered by the script
# most notably by `src/interface/choose_action.py`
content_dir = "/tmp/com.developomp.setup"

View file

@ -4,17 +4,18 @@ from os.path import exists
from ..util import import_file
from src.log import log
from src.constants import tmp_dir
from src import constants
def choose_action():
directory_to_search = tmp_dir
if exists("src/"):
directory_to_search = "."
if exists(".git/") and exists("src/"):
constants.content_dir = "."
files = glob(f"{directory_to_search}/src/setup/**/*.py")
content_dir = constants.content_dir
files = glob(f"{content_dir}/src/setup/**/*.py")
files = [
s.removeprefix(f"{directory_to_search}/src/setup/")
s.removeprefix(f"{content_dir}/src/setup/")
for s in files
if "__init__.py" not in s
]
@ -31,9 +32,7 @@ def choose_action():
post_install_tasks = []
for action_name in response["actions"]:
module = import_file(
action_name, f"{directory_to_search}/src/setup/{action_name}"
)
module = import_file(action_name, f"{content_dir}/src/setup/{action_name}")
if hasattr(module, "post_install"):
if isinstance(module.post_install, str):

View file

@ -1,4 +1,4 @@
from src.constants import tmp_dir
from src.constants import content_dir
from src.util import pamac_install, copy_file
from os import makedirs
@ -13,6 +13,6 @@ def setup() -> None:
# copy configuration file
copy_file(
f"{tmp_dir}/home/pomp/.config/alacritty/alacritty.yml",
f"{content_dir}/home/pomp/.config/alacritty/alacritty.yml",
"~/.config/alacritty/alacritty.yml",
)

View file

@ -1,5 +1,5 @@
from src.util import flatpak_install, copy_file
from src.constants import tmp_dir
from src.constants import content_dir
name = "Browsers"
post_install = ["restore onetab"]
@ -10,7 +10,7 @@ def setup():
# install librewolf
flatpak_install("io.gitlab.librewolf-community")
copy_file(
f"{tmp_dir}/home/pomp/.config/autostart/librewolf.desktop",
f"{content_dir}/home/pomp/.config/autostart/librewolf.desktop",
"~/.config/autostart/librewolf.desktop",
)
# todo: settings

View file

@ -1,5 +1,5 @@
from src.util import flatpak_install, pamac_install, copy_file
from src.constants import tmp_dir
from src.constants import content_dir
from src import log
from os import system
@ -55,7 +55,7 @@ def setup():
pamac_install("betterdiscordctl-git")
copy_file(
f"{tmp_dir}/home/pomp/.config/autostart/discord.desktop",
f"{content_dir}/home/pomp/.config/autostart/discord.desktop",
"~/.config/autostart/discord.desktop",
)

View file

@ -1,5 +1,5 @@
from src.util import flatpak_install, copy_file
from src.constants import tmp_dir
from src.constants import content_dir
from os import system
@ -56,18 +56,18 @@ def setup():
# autostart vscodium
copy_file(
f"{tmp_dir}/home/pomp/.config/autostart/codium.desktop",
f"{content_dir}/home/pomp/.config/autostart/codium.desktop",
"~/.config/autostart/codium.desktop",
)
# vscodium settings
copy_file(
f"{tmp_dir}/home/pomp/.config/VSCodium/User/settings.json",
f"{content_dir}/home/pomp/.config/VSCodium/User/settings.json",
"~/.config/VSCodium/User/settings.json",
)
# enable vscode extension store
copy_file(
f"{tmp_dir}/home/pomp/.config/VSCodium/product.json",
f"{content_dir}/home/pomp/.config/VSCodium/product.json",
"~/.config/VSCodium/product.json",
)

View file

@ -1,5 +1,5 @@
from src.util import pamac_install, smart_mkdir, download, unzip
from src.constants import tmp_dir
from src.constants import content_dir
from shutil import rmtree, move
from os import remove, system
from os.path import exists
@ -9,7 +9,7 @@ import glob
name = "fonts"
# path to temporarily save font related files
TMP_FONTS_DIRECTORY = f"{tmp_dir}/tmp/fonts"
TMP_FONTS_DIRECTORY = f"{content_dir}/tmp/fonts"
# fonts to download
FONT_NAMES = ("Audiowide", "Varela Round", "Ubuntu Mono", "Nanum Gothic Coding")

View file

@ -1,5 +1,5 @@
from src.util import pamac_install, copy_file
from src.constants import tmp_dir
from src.constants import content_dir
from src import log
from os.path import isdir
@ -33,4 +33,4 @@ def setup():
)
# apply zshrc configuration
copy_file(f"{tmp_dir}/home/pomp/.zshrc", "~/.zshrc")
copy_file(f"{content_dir}/home/pomp/.zshrc", "~/.zshrc")

View file

@ -1,4 +1,4 @@
from .constants import tmp_dir
from .constants import content_dir
from importlib.machinery import SourceFileLoader
from os import system, makedirs
@ -75,13 +75,13 @@ def copy_directory(src: str, dst: str):
dst: A path-like object or string pointing to a directory.
"""
system(f"cp -r {src} {dst}")
system(f"cp -R {src} {dst}")
def load_dconf(file_name: str):
"""Loads dconf configuration"""
system(f'dconf load / < "{tmp_dir}/dconf/{file_name}"')
system(f'dconf load / < "{content_dir}/dconf/{file_name}"')
def download(file_name: str, url: str):