diff --git a/cargo-dist-schema/src/lib.rs b/cargo-dist-schema/src/lib.rs index cbbebc964..aa2075963 100644 --- a/cargo-dist-schema/src/lib.rs +++ b/cargo-dist-schema/src/lib.rs @@ -581,9 +581,23 @@ pub struct EnvironmentVariables { pub disable_update_env_var: String, /// Environment variable to disable modifying the path pub no_modify_path_env_var: String, + /// Environment variable to make the installer more quiet + pub print_quiet_env_var: String, + /// Environment variable to make the installer more verbose + pub print_verbose_env_var: String, + /// Environment variable to override the URL to download from + /// + /// This trumps the base_url env vars below. + pub download_url_env_var: String, /// Environment variable to set the GitHub base URL + /// + /// `{owner}/{repo}` will be added to the end of this value to + /// construct the installer_download_url. pub github_base_url_env_var: String, /// Environment variable to set the GitHub Enterprise base URL + /// + /// `{owner}/{repo}` will be added to the end of this value to + /// construct the installer_download_url. pub ghe_base_url_env_var: String, /// Environment variable to set the GitHub BEARER token when fetching archives pub github_token_env_var: String, @@ -911,8 +925,11 @@ impl DistManifest { } else { let env_app_name = name.to_ascii_uppercase().replace('-', "_"); let install_dir_env_var = format!("{env_app_name}_INSTALL_DIR"); + let download_url_env_var = format!("{env_app_name}_DOWNLOAD_URL"); let unmanaged_dir_env_var = format!("{env_app_name}_UNMANAGED_INSTALL"); let disable_update_env_var = format!("{env_app_name}_DISABLE_UPDATE"); + let print_quiet_env_var = format!("{env_app_name}_PRINT_QUIET"); + let print_verbose_env_var = format!("{env_app_name}_PRINT_VERBOSE"); let no_modify_path_env_var = format!("{env_app_name}_NO_MODIFY_PATH"); let github_base_url_env_var = format!("{env_app_name}_INSTALLER_GITHUB_BASE_URL"); let ghe_base_url_env_var = format!("{env_app_name}_INSTALLER_GHE_BASE_URL"); @@ -920,8 +937,11 @@ impl DistManifest { let environment_variables = EnvironmentVariables { install_dir_env_var, + download_url_env_var, unmanaged_dir_env_var, disable_update_env_var, + print_quiet_env_var, + print_verbose_env_var, no_modify_path_env_var, github_base_url_env_var, ghe_base_url_env_var, diff --git a/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap b/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap index eaba261cf..a503d68ca 100644 --- a/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap +++ b/cargo-dist-schema/src/snapshots/cargo_dist_schema__emit.snap @@ -679,11 +679,14 @@ expression: json_schema "type": "object", "required": [ "disable_update_env_var", + "download_url_env_var", "ghe_base_url_env_var", "github_base_url_env_var", "github_token_env_var", "install_dir_env_var", "no_modify_path_env_var", + "print_quiet_env_var", + "print_verbose_env_var", "unmanaged_dir_env_var" ], "properties": { @@ -691,12 +694,16 @@ expression: json_schema "description": "Environment variable to disable updater features", "type": "string" }, + "download_url_env_var": { + "description": "Environment variable to override the URL to download from\n\nThis trumps the base_url env vars below.", + "type": "string" + }, "ghe_base_url_env_var": { - "description": "Environment variable to set the GitHub Enterprise base URL", + "description": "Environment variable to set the GitHub Enterprise base URL\n\n`{owner}/{repo}` will be added to the end of this value to construct the installer_download_url.", "type": "string" }, "github_base_url_env_var": { - "description": "Environment variable to set the GitHub base URL", + "description": "Environment variable to set the GitHub base URL\n\n`{owner}/{repo}` will be added to the end of this value to construct the installer_download_url.", "type": "string" }, "github_token_env_var": { @@ -711,6 +718,14 @@ expression: json_schema "description": "Environment variable to disable modifying the path", "type": "string" }, + "print_quiet_env_var": { + "description": "Environment variable to make the installer more quiet", + "type": "string" + }, + "print_verbose_env_var": { + "description": "Environment variable to make the installer more verbose", + "type": "string" + }, "unmanaged_dir_env_var": { "description": "Environment variable to force an unmanaged install location", "type": "string" diff --git a/cargo-dist/templates/installer/installer.ps1.j2 b/cargo-dist/templates/installer/installer.ps1.j2 index 36fe7bf26..48997644a 100644 --- a/cargo-dist/templates/installer/installer.ps1.j2 +++ b/cargo-dist/templates/installer/installer.ps1.j2 @@ -56,7 +56,9 @@ if ($env:{{ env_vars.ghe_base_url_env_var }}) { } else { $installer_base_url = "{{ hosting.github.artifact_base_url }}" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:{{ env_vars.download_url_env_var }}) { + $ArtifactDownloadUrl = $env:{{ env_vars.download_url_env_var }} +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url{{ hosting.github.artifact_download_path }}" diff --git a/cargo-dist/templates/installer/installer.sh.j2 b/cargo-dist/templates/installer/installer.sh.j2 index 49a24774f..a724d27aa 100644 --- a/cargo-dist/templates/installer/installer.sh.j2 +++ b/cargo-dist/templates/installer/installer.sh.j2 @@ -30,13 +30,23 @@ if [ -n "{{ '${' }}{{ env_vars.ghe_base_url_env_var }}:-}" ]; then else INSTALLER_BASE_URL="{{ '${' }}{{ env_vars.github_base_url_env_var }}:-{{ hosting.github.artifact_base_url }}}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "{{ '${' }}{{ env_vars.download_url_env_var }}:-}" ]; then + ARTIFACT_DOWNLOAD_URL="${{ env_vars.download_url_env_var }}" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}{{ hosting.github.artifact_download_path }}" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "{{ '${' }}{{ env_vars.print_verbose_env_var }}:-}" ]; then + PRINT_VERBOSE="${{ env_vars.print_verbose_env_var }}" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "{{ '${' }}{{ env_vars.print_quiet_env_var }}:-}" ]; then + PRINT_QUIET="${{ env_vars.print_quiet_env_var }}" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "{{ '${' }}{{ env_vars.no_modify_path_env_var }}:-}" ]; then NO_MODIFY_PATH="${{ env_vars.no_modify_path_env_var }}" else diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap index 218599c6f..48e648a84 100644 --- a/cargo-dist/tests/snapshots/akaikatana_basic.snap +++ b/cargo-dist/tests/snapshots/akaikatana_basic.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ akaikatana-repack-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AKAIKATANA_REPACK_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AKAIKATANA_REPACK_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/mistydemeo/akaikatana-repack/releases/download/v0.2.0" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AKAIKATANA_REPACK_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AKAIKATANA_REPACK_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AKAIKATANA_REPACK_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AKAIKATANA_REPACK_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AKAIKATANA_REPACK_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AKAIKATANA_REPACK_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" @@ -2136,6 +2147,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AKAIKATANA_REPACK_UNMANAGED_INSTALL", "disable_update_env_var": "AKAIKATANA_REPACK_DISABLE_UPDATE", "no_modify_path_env_var": "AKAIKATANA_REPACK_NO_MODIFY_PATH", + "print_quiet_env_var": "AKAIKATANA_REPACK_PRINT_QUIET", + "print_verbose_env_var": "AKAIKATANA_REPACK_PRINT_VERBOSE", + "download_url_env_var": "AKAIKATANA_REPACK_DOWNLOAD_URL", "github_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AKAIKATANA_REPACK_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/akaikatana_bins.snap b/cargo-dist/tests/snapshots/akaikatana_bins.snap index 535b3929d..c81938c40 100644 --- a/cargo-dist/tests/snapshots/akaikatana_bins.snap +++ b/cargo-dist/tests/snapshots/akaikatana_bins.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ akaikatana-repack-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AKAIKATANA_REPACK_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AKAIKATANA_REPACK_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/mistydemeo/akaikatana-repack/releases/download/v0.2.0" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AKAIKATANA_REPACK_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AKAIKATANA_REPACK_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AKAIKATANA_REPACK_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AKAIKATANA_REPACK_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AKAIKATANA_REPACK_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AKAIKATANA_REPACK_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" @@ -2136,6 +2147,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AKAIKATANA_REPACK_UNMANAGED_INSTALL", "disable_update_env_var": "AKAIKATANA_REPACK_DISABLE_UPDATE", "no_modify_path_env_var": "AKAIKATANA_REPACK_NO_MODIFY_PATH", + "print_quiet_env_var": "AKAIKATANA_REPACK_PRINT_QUIET", + "print_verbose_env_var": "AKAIKATANA_REPACK_PRINT_VERBOSE", + "download_url_env_var": "AKAIKATANA_REPACK_DOWNLOAD_URL", "github_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AKAIKATANA_REPACK_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/akaikatana_musl.snap b/cargo-dist/tests/snapshots/akaikatana_musl.snap index a775089f0..47a99e2d8 100644 --- a/cargo-dist/tests/snapshots/akaikatana_musl.snap +++ b/cargo-dist/tests/snapshots/akaikatana_musl.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ akaikatana-repack-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AKAIKATANA_REPACK_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AKAIKATANA_REPACK_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/mistydemeo/akaikatana-repack/releases/download/v0.2.0" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AKAIKATANA_REPACK_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AKAIKATANA_REPACK_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AKAIKATANA_REPACK_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AKAIKATANA_REPACK_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AKAIKATANA_REPACK_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AKAIKATANA_REPACK_NO_MODIFY_PATH" else @@ -1524,6 +1533,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AKAIKATANA_REPACK_UNMANAGED_INSTALL", "disable_update_env_var": "AKAIKATANA_REPACK_DISABLE_UPDATE", "no_modify_path_env_var": "AKAIKATANA_REPACK_NO_MODIFY_PATH", + "print_quiet_env_var": "AKAIKATANA_REPACK_PRINT_QUIET", + "print_verbose_env_var": "AKAIKATANA_REPACK_PRINT_VERBOSE", + "download_url_env_var": "AKAIKATANA_REPACK_DOWNLOAD_URL", "github_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AKAIKATANA_REPACK_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap b/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap index 1a715bb98..1356bc0c9 100644 --- a/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap +++ b/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ akaikatana-repack-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AKAIKATANA_REPACK_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AKAIKATANA_REPACK_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/mistydemeo/akaikatana-repack/releases/download/v0.2.0" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AKAIKATANA_REPACK_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AKAIKATANA_REPACK_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AKAIKATANA_REPACK_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AKAIKATANA_REPACK_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AKAIKATANA_REPACK_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AKAIKATANA_REPACK_NO_MODIFY_PATH" else @@ -1638,7 +1647,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" @@ -2167,6 +2178,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AKAIKATANA_REPACK_UNMANAGED_INSTALL", "disable_update_env_var": "AKAIKATANA_REPACK_DISABLE_UPDATE", "no_modify_path_env_var": "AKAIKATANA_REPACK_NO_MODIFY_PATH", + "print_quiet_env_var": "AKAIKATANA_REPACK_PRINT_QUIET", + "print_verbose_env_var": "AKAIKATANA_REPACK_PRINT_VERBOSE", + "download_url_env_var": "AKAIKATANA_REPACK_DOWNLOAD_URL", "github_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AKAIKATANA_REPACK_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap index 7140f7001..edc5a7a03 100644 --- a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap +++ b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ akaikatana-repack-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AKAIKATANA_REPACK_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AKAIKATANA_REPACK_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/mistydemeo/akaikatana-repack/releases/download/v0.2.0" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AKAIKATANA_REPACK_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AKAIKATANA_REPACK_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AKAIKATANA_REPACK_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AKAIKATANA_REPACK_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AKAIKATANA_REPACK_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AKAIKATANA_REPACK_NO_MODIFY_PATH" else @@ -1662,7 +1671,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" @@ -2194,6 +2205,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AKAIKATANA_REPACK_UNMANAGED_INSTALL", "disable_update_env_var": "AKAIKATANA_REPACK_DISABLE_UPDATE", "no_modify_path_env_var": "AKAIKATANA_REPACK_NO_MODIFY_PATH", + "print_quiet_env_var": "AKAIKATANA_REPACK_PRINT_QUIET", + "print_verbose_env_var": "AKAIKATANA_REPACK_PRINT_VERBOSE", + "download_url_env_var": "AKAIKATANA_REPACK_DOWNLOAD_URL", "github_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AKAIKATANA_REPACK_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap index f0622cc72..983a4ac44 100644 --- a/cargo-dist/tests/snapshots/akaikatana_updaters.snap +++ b/cargo-dist/tests/snapshots/akaikatana_updaters.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ akaikatana-repack-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AKAIKATANA_REPACK_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AKAIKATANA_REPACK_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/mistydemeo/akaikatana-repack/releases/download/v0.2.0" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AKAIKATANA_REPACK_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AKAIKATANA_REPACK_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AKAIKATANA_REPACK_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AKAIKATANA_REPACK_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AKAIKATANA_REPACK_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AKAIKATANA_REPACK_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AKAIKATANA_REPACK_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AKAIKATANA_REPACK_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/mistydemeo/akaikatana-repack/releases/download/v0.2.0" @@ -2148,6 +2159,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AKAIKATANA_REPACK_UNMANAGED_INSTALL", "disable_update_env_var": "AKAIKATANA_REPACK_DISABLE_UPDATE", "no_modify_path_env_var": "AKAIKATANA_REPACK_NO_MODIFY_PATH", + "print_quiet_env_var": "AKAIKATANA_REPACK_PRINT_QUIET", + "print_verbose_env_var": "AKAIKATANA_REPACK_PRINT_VERBOSE", + "download_url_env_var": "AKAIKATANA_REPACK_DOWNLOAD_URL", "github_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AKAIKATANA_REPACK_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AKAIKATANA_REPACK_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap b/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap index 6b311c221..e04c988cf 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_action_commit.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1678,7 +1687,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3852,6 +3863,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap index f8007b6ac..af8415d9e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1638,7 +1647,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3793,6 +3804,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap index 7d194c013..644c25746 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1642,7 +1651,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3795,6 +3806,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap index 0d93fb870..fe62b43fa 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1678,7 +1687,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3852,6 +3863,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap index a8e872d0a..96af5e469 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_bins.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1678,7 +1687,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3870,6 +3881,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap index 80ecfaa39..5e8a48ce0 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1613,7 +1622,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3770,6 +3781,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap index 3236954ff..39ec1a31f 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap index a27ee7427..2c9486889 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2b.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1513,6 +1522,9 @@ download_binary_and_run_installer "$@" || exit 1 "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap index 52ed74922..5a3c62d7e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_blake2s.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1513,6 +1522,9 @@ download_binary_and_run_installer "$@" || exit 1 "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap index 81ab5cb70..414e000b6 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_256.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1513,6 +1522,9 @@ download_binary_and_run_installer "$@" || exit 1 "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap index e8fa48cc4..2fe14e469 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_checksum_sha3_512.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1513,6 +1522,9 @@ download_binary_and_run_installer "$@" || exit 1 "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_cross1.snap b/cargo-dist/tests/snapshots/axolotlsay_cross1.snap index efb71f957..38927d4f7 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_cross1.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_cross1.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1611,7 +1620,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2148,6 +2159,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_cross2.snap b/cargo-dist/tests/snapshots/axolotlsay_cross2.snap index 4d3a0049b..28aaf084d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_cross2.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_cross2.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1475,7 +1484,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -1992,6 +2003,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap b/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap index 155cf7989..5336ea723 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_custom_formula.snap @@ -89,6 +89,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap b/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap index dfcce2912..6233d2178 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_custom_github_runners.snap @@ -24,6 +24,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap index 1d4a0d003..fb24f5ebb 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3759,6 +3770,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) axolotlsay-n "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap b/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap index 016a85887..a46b93abf 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dispatch.snap @@ -24,6 +24,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap index 06950813a..e05be056b 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1545,7 +1554,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2072,6 +2083,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap index 15b5187e7..6cc78c37d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap index 0fe056f44..4f445717d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-js-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_JS_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_JS_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_JS_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_JS_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay-hybrid/releases/download/v0.10.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_JS_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_JS_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_JS_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_JS_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_JS_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_JS_NO_MODIFY_PATH" else @@ -1609,7 +1618,9 @@ if ($env:AXOLOTLSAY_JS_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_JS_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_JS_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay-hybrid/releases/download/v0.10.2" @@ -2151,13 +2162,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay-hybrid/releases/download/v0.10.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -3725,7 +3746,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay-hybrid/releases/download/v0.10.2" @@ -4251,6 +4274,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" @@ -4290,6 +4316,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_JS_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_JS_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_JS_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_JS_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_JS_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_JS_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_JS_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_JS_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_JS_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap index fedf15373..eb4ca137c 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_linux_only.snap @@ -72,6 +72,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap index ee95a0b95..256061e32 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_macos_x86_64_only.snap @@ -74,6 +74,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap index 2e16b1e79..dfed318fd 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_musl.snap b/cargo-dist/tests/snapshots/axolotlsay_musl.snap index 58e1dbfde..c60e57dab 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_musl.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_musl.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -3141,6 +3150,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap b/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap index 493c74be4..93e7d8f36 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_musl_no_gnu.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -3121,6 +3130,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap index 3795fbab3..4e460382c 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap b/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap index 80f1d6c79..3b85da77e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_locals.snap @@ -24,6 +24,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap b/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap index 3a173b165..3e9a75283 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_locals_but_custom.snap @@ -24,6 +24,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap index 117c117a7..6156d0f32 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1642,7 +1651,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3799,6 +3810,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap index fa3062406..98ecfc71e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1545,7 +1554,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2072,6 +2083,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap index fa3062406..98ecfc71e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1545,7 +1554,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2072,6 +2083,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap b/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap index 12011e556..0d276d259 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_tag_namespace.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ sha256.sum ================ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.gz @@ -25,6 +24,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap index 43cd9995b..47d6c611f 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3772,6 +3783,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap index 0bd8acb82..01c0ddb9e 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap index d30a629b3..b291a81c4 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap index cbcfac71d..abb44857a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap index d82b08d84..d05b1d26d 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap index 5a225d968..a9188c229 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -3760,6 +3771,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_cargo_home.snap b/cargo-dist/tests/snapshots/install_path_cargo_home.snap index a25698b2f..b98d6332c 100644 --- a/cargo-dist/tests/snapshots/install_path_cargo_home.snap +++ b/cargo-dist/tests/snapshots/install_path_cargo_home.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1610,7 +1619,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2137,6 +2148,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap index 9b33e40f5..3327d355e 100644 --- a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_subdir.snap index 9a19361fd..d784560d3 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap index c152a26c6..ed9d407a4 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap b/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap index 96da9649e..58fc8b7c2 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap b/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap index d8531c482..f44c69d5d 100644 --- a/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap +++ b/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1607,7 +1616,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2136,6 +2147,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap index cba5cc4bb..6389f21f3 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap index 176dc4a4f..9488ea87e 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap index d228cbee4..7bcd2a3e9 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap index dabd0c71b..990d827ba 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1593,7 +1602,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2113,6 +2124,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap index b99714eaf..f45d0fa33 100644 --- a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap +++ b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap @@ -1,7 +1,6 @@ --- source: cargo-dist/tests/gallery/dist/snapshot.rs expression: self.payload -snapshot_kind: text --- ================ axolotlsay-installer.sh ================ #!/bin/sh @@ -36,13 +35,23 @@ if [ -n "${AXOLOTLSAY_INSTALLER_GHE_BASE_URL:-}" ]; then else INSTALLER_BASE_URL="${AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL:-https://github.com}" fi -if [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then +if [ -n "${AXOLOTLSAY_DOWNLOAD_URL:-}" ]; then + ARTIFACT_DOWNLOAD_URL="$AXOLOTLSAY_DOWNLOAD_URL" +elif [ -n "${INSTALLER_DOWNLOAD_URL:-}" ]; then ARTIFACT_DOWNLOAD_URL="$INSTALLER_DOWNLOAD_URL" else ARTIFACT_DOWNLOAD_URL="${INSTALLER_BASE_URL}/axodotdev/axolotlsay/releases/download/v0.2.2" fi -PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} -PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +if [ -n "${AXOLOTLSAY_PRINT_VERBOSE:-}" ]; then + PRINT_VERBOSE="$AXOLOTLSAY_PRINT_VERBOSE" +else + PRINT_VERBOSE=${INSTALLER_PRINT_VERBOSE:-0} +fi +if [ -n "${AXOLOTLSAY_PRINT_QUIET:-}" ]; then + PRINT_QUIET="$AXOLOTLSAY_PRINT_QUIET" +else + PRINT_QUIET=${INSTALLER_PRINT_QUIET:-0} +fi if [ -n "${AXOLOTLSAY_NO_MODIFY_PATH:-}" ]; then NO_MODIFY_PATH="$AXOLOTLSAY_NO_MODIFY_PATH" else @@ -1607,7 +1616,9 @@ if ($env:AXOLOTLSAY_INSTALLER_GHE_BASE_URL) { } else { $installer_base_url = "https://github.com" } -if ($env:INSTALLER_DOWNLOAD_URL) { +if ($env:AXOLOTLSAY_DOWNLOAD_URL) { + $ArtifactDownloadUrl = $env:AXOLOTLSAY_DOWNLOAD_URL +} elseif ($env:INSTALLER_DOWNLOAD_URL) { $ArtifactDownloadUrl = $env:INSTALLER_DOWNLOAD_URL } else { $ArtifactDownloadUrl = "$installer_base_url/axodotdev/axolotlsay/releases/download/v0.2.2" @@ -2136,6 +2147,9 @@ CENSORED (see https://github.com/axodotdev/cargo-dist/issues/1477) source.tar.g "unmanaged_dir_env_var": "AXOLOTLSAY_UNMANAGED_INSTALL", "disable_update_env_var": "AXOLOTLSAY_DISABLE_UPDATE", "no_modify_path_env_var": "AXOLOTLSAY_NO_MODIFY_PATH", + "print_quiet_env_var": "AXOLOTLSAY_PRINT_QUIET", + "print_verbose_env_var": "AXOLOTLSAY_PRINT_VERBOSE", + "download_url_env_var": "AXOLOTLSAY_DOWNLOAD_URL", "github_base_url_env_var": "AXOLOTLSAY_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "AXOLOTLSAY_INSTALLER_GHE_BASE_URL", "github_token_env_var": "AXOLOTLSAY_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/lib_manifest.snap b/cargo-dist/tests/snapshots/lib_manifest.snap index fd77c57ff..6a6278045 100644 --- a/cargo-dist/tests/snapshots/lib_manifest.snap +++ b/cargo-dist/tests/snapshots/lib_manifest.snap @@ -20,6 +20,9 @@ stdout: "unmanaged_dir_env_var": "CARGO_DIST_SCHEMA_UNMANAGED_INSTALL", "disable_update_env_var": "CARGO_DIST_SCHEMA_DISABLE_UPDATE", "no_modify_path_env_var": "CARGO_DIST_SCHEMA_NO_MODIFY_PATH", + "print_quiet_env_var": "CARGO_DIST_SCHEMA_PRINT_QUIET", + "print_verbose_env_var": "CARGO_DIST_SCHEMA_PRINT_VERBOSE", + "download_url_env_var": "CARGO_DIST_SCHEMA_DOWNLOAD_URL", "github_base_url_env_var": "CARGO_DIST_SCHEMA_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "CARGO_DIST_SCHEMA_INSTALLER_GHE_BASE_URL", "github_token_env_var": "CARGO_DIST_SCHEMA_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/lib_manifest_slash.snap b/cargo-dist/tests/snapshots/lib_manifest_slash.snap index 248cdc82a..6659d1435 100644 --- a/cargo-dist/tests/snapshots/lib_manifest_slash.snap +++ b/cargo-dist/tests/snapshots/lib_manifest_slash.snap @@ -20,6 +20,9 @@ stdout: "unmanaged_dir_env_var": "CARGO_DIST_SCHEMA_UNMANAGED_INSTALL", "disable_update_env_var": "CARGO_DIST_SCHEMA_DISABLE_UPDATE", "no_modify_path_env_var": "CARGO_DIST_SCHEMA_NO_MODIFY_PATH", + "print_quiet_env_var": "CARGO_DIST_SCHEMA_PRINT_QUIET", + "print_verbose_env_var": "CARGO_DIST_SCHEMA_PRINT_VERBOSE", + "download_url_env_var": "CARGO_DIST_SCHEMA_DOWNLOAD_URL", "github_base_url_env_var": "CARGO_DIST_SCHEMA_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "CARGO_DIST_SCHEMA_INSTALLER_GHE_BASE_URL", "github_token_env_var": "CARGO_DIST_SCHEMA_GITHUB_TOKEN" diff --git a/cargo-dist/tests/snapshots/manifest.snap b/cargo-dist/tests/snapshots/manifest.snap index 5259b5be4..e71db5833 100644 --- a/cargo-dist/tests/snapshots/manifest.snap +++ b/cargo-dist/tests/snapshots/manifest.snap @@ -20,6 +20,9 @@ stdout: "unmanaged_dir_env_var": "CARGO_DIST_UNMANAGED_INSTALL", "disable_update_env_var": "CARGO_DIST_DISABLE_UPDATE", "no_modify_path_env_var": "CARGO_DIST_NO_MODIFY_PATH", + "print_quiet_env_var": "CARGO_DIST_PRINT_QUIET", + "print_verbose_env_var": "CARGO_DIST_PRINT_VERBOSE", + "download_url_env_var": "CARGO_DIST_DOWNLOAD_URL", "github_base_url_env_var": "CARGO_DIST_INSTALLER_GITHUB_BASE_URL", "ghe_base_url_env_var": "CARGO_DIST_INSTALLER_GHE_BASE_URL", "github_token_env_var": "CARGO_DIST_GITHUB_TOKEN"