diff --git a/osxphotos/cli/common.py b/osxphotos/cli/common.py index 68cafb34..e1b6cb1f 100644 --- a/osxphotos/cli/common.py +++ b/osxphotos/cli/common.py @@ -111,7 +111,6 @@ def check_version(): if latest_version and version.parse(latest_version) > version.parse(__version__): click.echo( f"New version {latest_version} available; you are running {__version__}\n" - "Run `pipx upgrade osxphotos` to upgrade.\n" "Use --no-version-check or set environment variable OSXPHOTOS_NO_VERSION_CHECK=1 " "to suppress this message and prevent osxphotos from checking for latest version.", err=True, @@ -124,5 +123,9 @@ def print_version(ctx, param, value): return click.echo(f"osxphotos, version {__version__}") click.echo(f"Python {sys.version}") - click.echo(f"macOS {'.'.join(get_macos_version())}, {platform.machine()}") + click.echo(f"Python executable: {sys.executable}") + if sys.platform.lower() == "darwin": + click.echo(f"macOS {'.'.join(get_macos_version())}, {platform.machine()}") + else: + click.echo(f"{sys.platform} {platform.machine()}") ctx.exit() diff --git a/osxphotos/cli/version.py b/osxphotos/cli/version.py index c8751678..decb9d5e 100644 --- a/osxphotos/cli/version.py +++ b/osxphotos/cli/version.py @@ -29,7 +29,6 @@ def version(ctx, cli_obj, run): ) > packaging.version.parse(__version__): click.echo( f"A new version of osxphotos is available: {latest_version} (you have {__version__})\n" - "Run `pipx upgrade osxphotos` to upgrade (assuming you installed osxphotos with pipx).\n" f"See {OSXPHOTOS_URL} for more information." ) if run: