install_deps: Do not request elevated rights when creating directory in owned directory.
This only creates elevated directory when necessary. Reviewed By: mont29 Differential Revision: https://developer.blender.org/D1596
This commit is contained in:
parent
2d94b0d6b0
commit
9aef0283a0
|
@ -1259,13 +1259,16 @@ version_match() {
|
|||
# ----------------------------------------------------------------------------
|
||||
# Generic compile helpers
|
||||
|
||||
prepare_opt() {
|
||||
prepare_inst() {
|
||||
INFO "Ensuring $INST exists and is writable by us"
|
||||
if [ ! $SUDO ]; then
|
||||
WARNING "--no-sudo enabled, might be impossible to create install dir..."
|
||||
fi
|
||||
|
||||
if [ ! -d $INST ]; then
|
||||
$SUDO mkdir -p $INST
|
||||
# Try to create normal user directory first to possibly avoid excessive
|
||||
# system operations
|
||||
mkdir -p $INST || $SUDO mkdir -p $INST
|
||||
fi
|
||||
|
||||
if [ ! -w $INST ]; then
|
||||
|
@ -1366,7 +1369,7 @@ compile_Python() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_python
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -1452,7 +1455,7 @@ compile_Numpy() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_numpy
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -1541,7 +1544,7 @@ compile_Boost() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_boost
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
INFO "Downloading Boost-$BOOST_VERSION"
|
||||
|
@ -1635,7 +1638,7 @@ compile_TBB() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_tbb
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
INFO "Downloading TBB-$TBB_VERSION$TBB_VERSION_UPDATE"
|
||||
|
@ -1752,7 +1755,7 @@ compile_OCIO() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_ocio
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
INFO "Downloading OpenColorIO-$OCIO_VERSION"
|
||||
|
@ -1884,7 +1887,7 @@ compile_OPENEXR() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_openexr
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
INFO "Downloading OpenEXR-$OPENEXR_VERSION"
|
||||
|
@ -2010,7 +2013,7 @@ compile_OIIO() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_oiio
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2165,7 +2168,7 @@ compile_LLVM() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_llvm
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src -o true ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2275,7 +2278,7 @@ compile_OSL() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_osl
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2419,7 +2422,7 @@ compile_OSD() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_osd
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2537,7 +2540,7 @@ compile_BLOSC() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_blosc
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
INFO "Downloading Blosc-$OPENVDB_BLOSC_VERSION"
|
||||
|
@ -2636,7 +2639,7 @@ compile_OPENVDB() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_openvdb
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src -o true ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2751,7 +2754,7 @@ compile_ALEMBIC() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_alembic
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2856,7 +2859,7 @@ compile_USD() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_usd
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -2955,7 +2958,7 @@ compile_OpenCOLLADA() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_collada
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -3061,7 +3064,7 @@ compile_Embree() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_embree
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -3171,7 +3174,7 @@ install_ISPC() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_ispc
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -3250,7 +3253,7 @@ compile_OIDN() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_oidn
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
@ -3360,7 +3363,7 @@ compile_FFmpeg() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_ffmpeg
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
INFO "Downloading ffmpeg-$FFMPEG_VERSION"
|
||||
|
@ -3489,7 +3492,7 @@ compile_XR_OpenXR_SDK() {
|
|||
# Rebuild dependencies as well!
|
||||
_update_deps_xr_openxr_sdk
|
||||
|
||||
prepare_opt
|
||||
prepare_inst
|
||||
|
||||
if [ ! -d $_src ]; then
|
||||
mkdir -p $SRC
|
||||
|
|
Loading…
Reference in New Issue