Skip to content

Commit

Permalink
fix(jans-linux-setup): install cb before jans installation (#3981)
Browse files Browse the repository at this point in the history
* fix(jans-linux-setup): install cb before jans installation

* fix(jans-linux-setup): typo
  • Loading branch information
devrimyatar committed Feb 27, 2023
1 parent 78f9118 commit dfed3b5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 4 additions & 0 deletions jans-linux-setup/jans_setup/jans_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,10 @@ def main():
if Config.rdbm_install_type == static.InstallTypes.LOCAL:
packageUtils.check_and_install_packages()

if Config.cb_install == static.InstallTypes.LOCAL:
print("Please wait while setup is installing couchbase package ...")
couchbaseInstaller.couchbaseInstall()

# register post setup progress
class PostSetup:
service_name = 'post-setup'
Expand Down
5 changes: 2 additions & 3 deletions jans-linux-setup/jans_setup/setup_app/installers/couchbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def install(self):

if Config.cb_install == InstallTypes.LOCAL:
self.add_couchbase_post_messages()
self.couchbaseInstall()
Config.pbar.progress(self.service_name, "Configuring Couchbase", incr=False)
self.checkIfJansBucketReady()
self.couchebaseCreateCluster()
Expand Down Expand Up @@ -103,11 +102,11 @@ def couchbaseInstall(self):

package_name = max(cb_package_list)
self.logIt("Found package '%s' for install" % package_name)
Config.pbar.progress(self.service_name, "Installing Couchbase package", incr=False)

if base.clone_type == 'deb':
apt_path = shutil.which('apt')
self.chown(self.couchbasePackageFolder, '_apt', 'nogroup', recursive=True)
install_output = self.run([apt_path, 'install', '-y', package_name])
install_output = self.run([apt_path, '--quiet', 'install', '-y', package_name])
else:
if not self.check_installed('ncurses-compat-libs'):
self.installNetPackage('ncurses-compat-libs')
Expand Down

0 comments on commit dfed3b5

Please sign in to comment.