From 132e5fe200954a9ec58024bdd3fb9da3f504bf85 Mon Sep 17 00:00:00 2001
From: Cameron Clough <cameronjclough@gmail.com>
Date: Wed, 30 Nov 2022 15:11:26 -0800
Subject: [PATCH] tools: pyenv setup fix (#26601)

* setup pyenv immediately

* sudo

* fix
old-commit-hash: 821d8ff12f3b9c9c9ba852dd7160f5a72d3d761d
---
 tools/ubuntu_setup.sh  | 18 ++++++++++++++----
 update_requirements.sh |  9 +++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tools/ubuntu_setup.sh b/tools/ubuntu_setup.sh
index 7e021bcc23..403437bfb3 100755
--- a/tools/ubuntu_setup.sh
+++ b/tools/ubuntu_setup.sh
@@ -4,13 +4,23 @@ set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 ROOT="$(cd $DIR/../ && pwd)"
+SUDO=""
 
 # NOTE: this is used in a docker build, so do not run any scripts here.
 
+# Use sudo if not root
+if [[ ! $(id -u) -eq 0 ]]; then
+  if [[ -z $(which sudo) ]]; then
+    echo "Please install sudo or run as root"
+    exit 1
+  fi
+  SUDO="sudo"
+fi
+
 # Install packages present in all supported versions of Ubuntu
 function install_ubuntu_common_requirements() {
-  sudo apt-get update
-  sudo apt-get install -y --no-install-recommends \
+  $SUDO apt-get update
+  $SUDO apt-get install -y --no-install-recommends \
     autoconf \
     build-essential \
     ca-certificates \
@@ -74,7 +84,7 @@ function install_ubuntu_common_requirements() {
 function install_ubuntu_jammy_requirements() {
   install_ubuntu_common_requirements
 
-  sudo apt-get install -y --no-install-recommends \
+  $SUDO apt-get install -y --no-install-recommends \
     qtbase5-dev \
     qtchooser \
     qt5-qmake \
@@ -86,7 +96,7 @@ function install_ubuntu_jammy_requirements() {
 function install_ubuntu_focal_requirements() {
   install_ubuntu_common_requirements
 
-  sudo apt-get install -y --no-install-recommends \
+  $SUDO apt-get install -y --no-install-recommends \
     libavresample-dev \
     qt5-default \
     python-dev
diff --git a/update_requirements.sh b/update_requirements.sh
index 8511a0a4d6..9195799ca3 100755
--- a/update_requirements.sh
+++ b/update_requirements.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
@@ -22,8 +22,13 @@ if [ -z "\$PYENV_ROOT" ]; then
   eval "\$(pyenv virtualenv-init -)"
 fi
 EOF
+
+  # setup now without restarting shell
+  export PATH=$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+  export PYENV_ROOT="$HOME/.pyenv"
+  eval "$(pyenv init -)"
+  eval "$(pyenv virtualenv-init -)"
 fi
-source $RC_FILE
 
 export MAKEFLAGS="-j$(nproc)"