Texte vergleichen

Finden Sie den Unterschied zwischen zwei Textdateien

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Onlinewerkzeuge

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

arch compare

Created 3 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

34 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

25 lines

function verifyZitiVersionExists {

function getLatestZitiVersion {

setupZitiHome

if ! setOs; then

return 1

ZITI_ARCH="amd64"

detected_arch="$(uname -m)"

if [[ "$(uname -a)" == *"arm"* ]] && [[ "${ZITI_OSTYPE}" == "darwin" ]]; then

# Apple M1 silicon

if [[ "${detected_arch}" == *"arm"* ]] && [[ "${ZITI_OSTYPE}" == "darwin" ]]; then

echo -e "$(YELLOW "WARN: It has been detected that you are using an Apple computer with ARM architecture. Deployment of Apple ARM architecture distributions is currently unsupported through git, the installer will pull darwin amd distribution instead.")"

# LLVM 64 bit backends have merged so some versions of *nix use aarch64 while others use arm64 for parity with Apple

elif [[ "$(uname -a)" == *"arm"* ]]; then

elif [[ "${detected_arch}" == *"aarch64"* ]] || [[ "${detected_arch}" == *"arm64"* ]]; then

ZITI_ARCH="arm64"

elif [[ "${detected_arch}" == *"arm"* ]]; then

ZITI_ARCH="arm"

unset ZITI_BINARIES_VERSION

ziticurl="$(curl -s https://api.github.com/repos/openziti/ziti/releases/tags/"${ZITI_VERSION_OVERRIDE}")"

if [[ "${ZITI_BINARIES_VERSION-}" == "" ]]; then

# shellcheck disable=SC2155

zitilatest=$(curl -s https://api.github.com/repos/openziti/ziti/releases/latest)

export ZITI_BINARIES_FILE=$(echo "${ziticurl}" | tr '\r\n' ' ' | jq -r '.assets[] | select(.name | startswith("'"ziti-${ZITI_OSTYPE}-${ZITI_ARCH}"'")) | .name')

# shellcheck disable=SC2155

export ZITI_BINARIES_FILE=$(echo "${zitilatest}" | tr '\r\n' ' ' | jq -r '.assets[] | select(.name | startswith("'"ziti-${ZITI_OSTYPE}-${ZITI_ARCH}"'")) | .name')

export ZITI_BINARIES_VERSION=$(echo "${ziticurl}" | tr '\r\n' ' ' | jq -r '.tag_name')

# shellcheck disable=SC2155

export ZITI_BINARIES_VERSION=$(echo "${zitilatest}" | tr '\r\n' ' ' | jq -r '.tag_name')

# Check if there was an error while trying to get the requested version

if [[ "${ZITI_BINARIES_VERSION-}" == "null" ]]; then

return 1

echo "ZITI_BINARIES_VERSION: ${ZITI_BINARIES_VERSION}"

}

Gespeicherten Diffs

Original text

Datei öffnen

function verifyZitiVersionExists {
  setupZitiHome

if ! setOs; then
    return 1
  fi

ZITI_ARCH="amd64"
  detected_arch="$(uname -m)"
  # Apple M1 silicon
  if [[ "${detected_arch}" == *"arm"* ]] && [[ "${ZITI_OSTYPE}" == "darwin" ]]; then
    echo -e "$(YELLOW "WARN: It has been detected that you are using an Apple computer with ARM architecture. Deployment of Apple ARM architecture distributions is currently unsupported through git, the installer will pull darwin amd distribution instead.")"
  # LLVM 64 bit backends have merged so some versions of *nix use aarch64 while others use arm64 for parity with Apple
  elif [[ "${detected_arch}" == *"aarch64"* ]] || [[ "${detected_arch}" == *"arm64"* ]]; then
    ZITI_ARCH="arm64"
  elif [[ "${detected_arch}" == *"arm"* ]]; then
    ZITI_ARCH="arm"
  fi

unset ZITI_BINARIES_VERSION

ziticurl="$(curl -s https://api.github.com/repos/openziti/ziti/releases/tags/"${ZITI_VERSION_OVERRIDE}")"
  # shellcheck disable=SC2155
  export ZITI_BINARIES_FILE=$(echo "${ziticurl}" | tr '\r\n' ' ' | jq -r '.assets[] | select(.name | startswith("'"ziti-${ZITI_OSTYPE}-${ZITI_ARCH}"'")) | .name')
  # shellcheck disable=SC2155
  export ZITI_BINARIES_VERSION=$(echo "${ziticurl}" | tr '\r\n' ' ' | jq -r '.tag_name')

# Check if there was an error while trying to get the requested version
  if [[ "${ZITI_BINARIES_VERSION-}" == "null" ]]; then
    return 1
  fi

echo "ZITI_BINARIES_VERSION: ${ZITI_BINARIES_VERSION}"
}

Geänderter text

Datei öffnen

function getLatestZitiVersion {
  setupZitiHome

if ! setOs; then
    return 1
  fi

ZITI_ARCH="amd64"
  if [[ "$(uname -a)" == *"arm"* ]] && [[ "${ZITI_OSTYPE}" == "darwin" ]]; then
    echo -e "$(YELLOW "WARN: It has been detected that you are using an Apple computer with ARM architecture. Deployment of Apple ARM architecture distributions is currently unsupported through git, the installer will pull darwin amd distribution instead.")"
  elif [[ "$(uname -a)" == *"arm"* ]]; then
    ZITI_ARCH="arm"
  fi

unset ZITI_BINARIES_VERSION

if [[ "${ZITI_BINARIES_VERSION-}" == "" ]]; then
    zitilatest=$(curl -s https://api.github.com/repos/openziti/ziti/releases/latest)
    # shellcheck disable=SC2155
    export ZITI_BINARIES_FILE=$(echo "${zitilatest}" | tr '\r\n' ' ' | jq -r '.assets[] | select(.name | startswith("'"ziti-${ZITI_OSTYPE}-${ZITI_ARCH}"'")) | .name')
    # shellcheck disable=SC2155
    export ZITI_BINARIES_VERSION=$(echo "${zitilatest}" | tr '\r\n' ' ' | jq -r '.tag_name')
  fi
  echo "ZITI_BINARIES_VERSION: ${ZITI_BINARIES_VERSION}"
}