sysetup 1.0.3__tar.gz → 1.0.4__tar.gz

{sysetup-1.0.3/sysetup.egg-info → sysetup-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysetup
-Version: 1.0.3
+Version: 1.0.4
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
 Project-URL: Source Code, https://github.com/quintenroets/sysetup
@@ -25,10 +25,11 @@ Requires-Dist: pytest; extra == "test"
 
 ## Setup steps
 1) Set display size (1920 x 1080)
-2) Execute setup command: password will need to be given once again for gpg decryption
+2) Run
    ```shell
    curl https://raw.githubusercontent.com/quintenroets/sysetup/main/bin/setup | bash
    ```
+   password will need to be given once again for gpg decryption
 3) Change wallpaper
 4) Appearance
    * Select We10XOS cursors

{sysetup-1.0.3 → sysetup-1.0.4}/README.md

@@ -6,10 +6,11 @@
 
 ## Setup steps
 1) Set display size (1920 x 1080)
-2) Execute setup command: password will need to be given once again for gpg decryption
+2) Run
    ```shell
    curl https://raw.githubusercontent.com/quintenroets/sysetup/main/bin/setup | bash
    ```
+   password will need to be given once again for gpg decryption
 3) Change wallpaper
 4) Appearance
    * Select We10XOS cursors

{sysetup-1.0.3 → sysetup-1.0.4}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "sysetup"
-version = "1.0.3"
+version = "1.0.4"
 description = ""
 authors = [{name = "Quinten Roets", email = "qdr2104@columbia.edu"}]
 license = {text = "MIT"}

{sysetup-1.0.3 → sysetup-1.0.4}/sysetup/env.py

@@ -7,7 +7,7 @@ from .path import Path
 
 
 def setup():
-    if "pw" not in os.environ:
+    if "SUDO_ASKPASS" not in os.environ:
         path = Path(".bash_profile")
         Backup(quiet=False, path=path).pull()
         cli.env.load()

sysetup-1.0.4/sysetup/files.py

@@ -0,0 +1,36 @@
+import cli
+from backup.backups import Backup
+from backup.utils import Path as BackupPath
+
+from .path import Path
+
+
+def setup():
+    sub_check_path = BackupPath.script_assets
+    kwargs_mapper = {
+        "Script assets": dict(sub_check_path=sub_check_path),
+        "environment": dict(
+            filter_rules=["+ /etc/environment", "- *"], sync_remote=False
+        ),
+    }
+    for name, kwargs in kwargs_mapper.items():
+        print(f"Downloading {name}..")
+        Backup(quiet=False, confirm=False, **kwargs).pull()
+
+    move_crontab()
+    # trust_keyboard()
+    # seems to work without this command for now
+
+
+def move_crontab():
+    src = Path.assets / "crontab" / "crontab"
+    cli.run("crontab -", input=src.text)
+
+
+def trust_keyboard():
+    keyboard = cli.get("bluetoothctl devices | grep Keyboard", shell=True)
+    cli.run("bluetoothctl trust", keyboard, wait=False)  # blocks if not found
+
+
+if __name__ == "__main__":
+    setup()

{sysetup-1.0.3 → sysetup-1.0.4/sysetup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sysetup
-Version: 1.0.3
+Version: 1.0.4
 Author-email: Quinten Roets <qdr2104@columbia.edu>
 License: MIT
 Project-URL: Source Code, https://github.com/quintenroets/sysetup
@@ -25,10 +25,11 @@ Requires-Dist: pytest; extra == "test"
 
 ## Setup steps
 1) Set display size (1920 x 1080)
-2) Execute setup command: password will need to be given once again for gpg decryption
+2) Run
    ```shell
    curl https://raw.githubusercontent.com/quintenroets/sysetup/main/bin/setup | bash
    ```
+   password will need to be given once again for gpg decryption
 3) Change wallpaper
 4) Appearance
    * Select We10XOS cursors

sysetup-1.0.3/sysetup/files.py

@@ -1,31 +0,0 @@
-import cli
-from backup.backups import backup
-
-from .path import Path
-
-
-def setup():
-    kwargs_list = [
-        dict(folder=Path.script_assets),
-        dict(filter_rules=[f"- {Path.HOME}/**"]),  # need /etc/environment
-    ]
-    for kwargs in kwargs_list:
-        backup.Backup(quiet=False, confirm=False, **kwargs).pull()
-
-    move_crontab()
-    # trust_keyboard()
-    # seems to work without this command for now
-
-
-def move_crontab():
-    src = Path.assets / "crontab" / "crontab"
-    cli.run("crontab -", input=src.text)
-
-
-def trust_keyboard():
-    keyboard = cli.get("bluetoothctl devices | grep Keyboard", shell=True)
-    cli.run("bluetoothctl trust", keyboard, wait=False)  # blocks if not found
-
-
-if __name__ == "__main__":
-    setup()