diff --git a/tools/run_tray_ayon.ps1 b/tools/run_tray_ayon.ps1 index c0651bdbbe..54a80f93fd 100644 --- a/tools/run_tray_ayon.ps1 +++ b/tools/run_tray_ayon.ps1 @@ -1,6 +1,6 @@ <# .SYNOPSIS - Helper script OpenPype Tray. + Helper script AYON Tray. .DESCRIPTION @@ -12,30 +12,30 @@ PS> .\run_tray.ps1 #> $current_dir = Get-Location $script_dir = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent -$openpype_root = (Get-Item $script_dir).parent.FullName +$ayon_root = (Get-Item $script_dir).parent.FullName # Install PSWriteColor to support colorized output to terminal -$env:PSModulePath = $env:PSModulePath + ";$($openpype_root)\tools\modules\powershell" +$env:PSModulePath = $env:PSModulePath + ";$($ayon_root)\tools\modules\powershell" $env:_INSIDE_OPENPYPE_TOOL = "1" # make sure Poetry is in PATH if (-not (Test-Path 'env:POETRY_HOME')) { - $env:POETRY_HOME = "$openpype_root\.poetry" + $env:POETRY_HOME = "$ayon_root\.poetry" } $env:PATH = "$($env:PATH);$($env:POETRY_HOME)\bin" -Set-Location -Path $openpype_root +Set-Location -Path $ayon_root Write-Color -Text ">>> ", "Reading Poetry ... " -Color Green, Gray -NoNewline if (-not (Test-Path -PathType Container -Path "$($env:POETRY_HOME)\bin")) { Write-Color -Text "NOT FOUND" -Color Yellow Write-Color -Text "*** ", "We need to install Poetry create virtual env first ..." -Color Yellow, Gray - & "$openpype_root\tools\create_env.ps1" + & "$ayon_root\tools\create_env.ps1" } else { Write-Color -Text "OK" -Color Green } -& "$($env:POETRY_HOME)\bin\poetry" run python "$($openpype_root)\ayon_start.py" tray --debug +& "$($env:POETRY_HOME)\bin\poetry" run python "$($ayon_root)\ayon_start.py" tray --debug Set-Location -Path $current_dir diff --git a/tools/run_tray_ayon.sh b/tools/run_tray_ayon.sh new file mode 100755 index 0000000000..3039750b87 --- /dev/null +++ b/tools/run_tray_ayon.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash +# Run AYON Tray + +# Colors for terminal + +RST='\033[0m' # Text Reset + +# Regular Colors +Black='\033[0;30m' # Black +Red='\033[0;31m' # Red +Green='\033[0;32m' # Green +Yellow='\033[0;33m' # Yellow +Blue='\033[0;34m' # Blue +Purple='\033[0;35m' # Purple +Cyan='\033[0;36m' # Cyan +White='\033[0;37m' # White + +# Bold +BBlack='\033[1;30m' # Black +BRed='\033[1;31m' # Red +BGreen='\033[1;32m' # Green +BYellow='\033[1;33m' # Yellow +BBlue='\033[1;34m' # Blue +BPurple='\033[1;35m' # Purple +BCyan='\033[1;36m' # Cyan +BWhite='\033[1;37m' # White + +# Bold High Intensity +BIBlack='\033[1;90m' # Black +BIRed='\033[1;91m' # Red +BIGreen='\033[1;92m' # Green +BIYellow='\033[1;93m' # Yellow +BIBlue='\033[1;94m' # Blue +BIPurple='\033[1;95m' # Purple +BICyan='\033[1;96m' # Cyan +BIWhite='\033[1;97m' # White + + +############################################################################## +# Return absolute path +# Globals: +# None +# Arguments: +# Path to resolve +# Returns: +# None +############################################################################### +realpath () { + echo $(cd $(dirname "$1"); pwd)/$(basename "$1") +} + +# Main +main () { + # Directories + ayon_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))) + + _inside_openpype_tool="1" + + if [[ -z $POETRY_HOME ]]; then + export POETRY_HOME="$ayon_root/.poetry" + fi + + echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c" + if [ -f "$POETRY_HOME/bin/poetry" ]; then + echo -e "${BIGreen}OK${RST}" + else + echo -e "${BIYellow}NOT FOUND${RST}" + echo -e "${BIYellow}***${RST} We need to install Poetry and virtual env ..." + . "$ayon_root/tools/create_env.sh" || { echo -e "${BIRed}!!!${RST} Poetry installation failed"; return; } + fi + + pushd "$ayon_root" > /dev/null || return > /dev/null + + echo -e "${BIGreen}>>>${RST} Running AYON Tray with debug option ..." + "$POETRY_HOME/bin/poetry" run python3 "$ayon_root/ayon_start.py" tray --debug +} + +main