Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: jans-linux-setup tweak install.py for new directory structure #825

Merged
merged 2 commits into from
Feb 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions jans-linux-setup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Scripts and templates to automate deployment and configuration of the Janssen Pr
make zipapp
```

This command will generate executable called `jans-setup.pyz` under the same directory.
This command will generate executable called `jans-linux-setup.pyz` under the same directory.

Installing Janssen Server
-----------------------
Expand All @@ -64,8 +64,8 @@ Execute installer with `-uninstall` argument

Run

`python3 jans-setup.pyz -uninstall`
`python3 jans-linux-setup.pyz -uninstall`

or if you used the `make install` command run `jans-setup -uninstall`.

Reinstalling Janssen Server
Expand Down
1 change: 1 addition & 0 deletions jans-linux-setup/install.py
2 changes: 1 addition & 1 deletion jans-linux-setup/jans_setup/install.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ def extract_setup():
if os.path.exists(setup_dir):
shutil.move(setup_dir, setup_dir + '-back.' + time.ctime())
print("Extracting jans-setup package")
extract_subdir(jans_zip_file, 'jans-linux-setup', setup_dir)
extract_subdir(jans_zip_file, 'jans-linux-setup/jans_setup', setup_dir)
extract_subdir(sqlalchemy_zip_file, 'lib/sqlalchemy', os.path.join(setup_dir, 'setup_app/pylib/sqlalchemy'))

target_setup = os.path.join(setup_dir, 'setup.py')
Expand Down