fix various installer issues

README.md

@@ -47,22 +47,12 @@ You no longer need to clone this repository to run Concierge.
 > [!TIP]
 > Pay attention to the use of dashes and underscores in the commands!
 
-If you're not concerned about using a virtual environment you can just use the 2 commands below in the directory of your choosing:
+Run the following while not being in a virtual environment. This command will create the virtual environment and run the installer from within it.
 
 `python -m pip install launch-concierge`
 
 `python -m launch_concierge.install`
 
-If you prefer to keep things contained in a virtual environment you can use the 4 commands below:
-
-`python -m venv .`
-
-`.\scripts\activate.ps1` or `source bin/activate` depending on your Operating System
-
-`pip install launch-concierge`
-
-`install_concierge`
-
 Answer the questions and then the installer will ask if you are ready to make changes to the system.  
 Answer "yes" and let the installation begin!
 There may be additional questions during the installation depending on the options you selected.

concierge_packages/installer/pyproject.toml

@@ -1,19 +1,17 @@
 [project]
 name = "install-concierge"
-version = "0.5a5"
+version = "0.5a12"
 requires-python = ">=3.10"
 dependencies = [
     "script-builder~=0.2a0",
     "isi-util~=0.2a0",
     "concierge-util~=0.2a2",
     "packaging",
-    "python-dotenv"
+    "python-dotenv",
+    "requests",
+    "cryptography"
 ]
 
-[project.scripts]
-install_concierge = "install_concierge.install:install"
-relaunch_concierge = "install_concierge.relaunch:relaunch"
-
 [build-system]
 requires = ["hatchling"]
 build-backend = "hatchling.build"

concierge_packages/installer/src/install_concierge/installer_lib/clean_up_existing.py

@@ -65,7 +65,7 @@ def clean_up_existing():
             print("Concierge instance discovered.")
             print("This script can help reset your system for a re-install.\n")
 
-            new_version = version("launch_concierge")
+            new_version = version("install_concierge")
             if existing_version and new_version != existing_version:
                 # find if we have any upgrade scripts between the existing and new version
                 start_index = find_index(

concierge_packages/installer/src/install_concierge/installer_lib/install_demo_users.py

@@ -8,6 +8,8 @@ def install_demo_users():
             "exec",
             "-d",
             "concierge",
-            "python -m concierge_scripts.add_keycloak_demo_users",
+            "python",
+            "-m",
+            "concierge_scripts.add_keycloak_demo_users",
         ]
     )

concierge_packages/installer/src/install_concierge/installer_lib/package_dir.py

@@ -1,4 +1,4 @@
 from importlib.resources import files
-import launch_concierge
+import install_concierge
 
-package_dir = files(launch_concierge)
+package_dir = files(install_concierge)

concierge_packages/launcher/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "launch-concierge"
-version = "0.5a5"
+version = "0.5a12"
 requires-python = ">=3.10"
 dependencies = [
     "script-builder~=0.2a1"

concierge_packages/launcher/src/launch_concierge/install.py

@@ -4,8 +4,8 @@
 
 def install():
     setup_pip()
-    install_package(f"concierge-installer=={version("launch_concierge")}")
-    run_in_venv("install_concierge")
+    install_package(f"install-concierge=={version("launch_concierge")}")
+    run_in_venv("install_concierge.install")
 
 
 if __name__ == "__main__":

concierge_packages/launcher/src/launch_concierge/relaunch.py

@@ -1,6 +1,8 @@
+from script_builder.util import run_in_venv
+
+
 def relaunch():
-    # TODO: run relaunch_concierge in venv
-    pass
+    run_in_venv("install_concierge.relaunch")
 
 
 if __name__ == "__main__":

publish_package.py

@@ -12,7 +12,7 @@
 cwd = os.getcwd()
 package_dir = os.path.join(cwd, "concierge_packages", package_name)
 os.chdir(package_dir)
-shutil.rmtree("dist")
+shutil.rmtree("dist", ignore_errors=True)
 subprocess.run(["python", "-m", "build"])
 os.chdir(cwd)
 subprocess.run(