diff --git a/dapostinstall.sh b/dapostinstall.sh index 816f514..67f9262 100755 --- a/dapostinstall.sh +++ b/dapostinstall.sh @@ -93,9 +93,9 @@ install_local_plugin_archive() { fi if [[ "$plugin_name" == "redis-manager" ]]; then - require_file "$DADIR/plugins/redis-manager/scripts/redis_migrate.sh" - chmod 755 "$DADIR/plugins/redis-manager/scripts/redis_migrate.sh" - "$DADIR/plugins/redis-manager/scripts/redis_migrate.sh" "$REDIS_VERSION" + require_file "$DADIR/plugins/redis-manager/scripts/redis_install.sh" + chmod 755 "$DADIR/plugins/redis-manager/scripts/redis_install.sh" + "$DADIR/plugins/redis-manager/scripts/redis_install.sh" "$REDIS_VERSION" fi } diff --git a/tests/quality_checks.sh b/tests/quality_checks.sh index 90865ed..7faeb89 100644 --- a/tests/quality_checks.sh +++ b/tests/quality_checks.sh @@ -85,6 +85,7 @@ assert_archive_clean_for_linux_tar "$ROOT_DIR/plugins/redis-manager.tar.gz" assert_gzip_tar_contains "$ROOT_DIR/plugins/borg-restore.tar.gz" './install.sh' assert_gzip_tar_contains "$ROOT_DIR/plugins/db-manager.tar.gz" './install.sh' assert_gzip_tar_contains "$ROOT_DIR/plugins/redis-manager.tar.gz" './install.sh' +assert_gzip_tar_contains "$ROOT_DIR/plugins/redis-manager.tar.gz" './scripts/redis_install.sh' assert_gzip_tar_contains "$ROOT_DIR/plugins/redis-manager.tar.gz" './scripts/redis_migrate.sh' assert_file_contains "$ROOT_DIR/da_cli.sh" '^DEFAULTPACKAGE=NO-LIMIT$' @@ -176,9 +177,9 @@ assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'tar -zxf "\$archive" -C "\$pl assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'chmod 755 "\$plugin_dir/install\.sh"' assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'cd "\$plugin_dir"' assert_file_contains "$ROOT_DIR/dapostinstall.sh" '\./install\.sh' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'chmod 755 "\$DADIR/plugins/redis-manager/scripts/redis_migrate\.sh"' -assert_file_contains "$ROOT_DIR/dapostinstall.sh" '"\$DADIR/plugins/redis-manager/scripts/redis_migrate\.sh" "\$REDIS_VERSION"' -assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'redis_install\.sh' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" 'chmod 755 "\$DADIR/plugins/redis-manager/scripts/redis_install\.sh"' +assert_file_contains "$ROOT_DIR/dapostinstall.sh" '"\$DADIR/plugins/redis-manager/scripts/redis_install\.sh" "\$REDIS_VERSION"' +assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'redis_migrate\.sh' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'redis_management\.tar\.gz' assert_file_not_contains "$ROOT_DIR/dapostinstall.sh" 'plugins/redis_management' assert_file_contains "$ROOT_DIR/mail_powitalny.txt" '\{\{DA_HOSTNAME\}\}'