diff --git a/conductor/lib/file_utils.py b/conductor/lib/file_utils.py index 005d2198..470a0c59 100644 --- a/conductor/lib/file_utils.py +++ b/conductor/lib/file_utils.py @@ -14,6 +14,7 @@ RX_UDIM_MUDBOX = r"" # image..exr RX_UDIM_VRAY = r"\$\d*U.*\$\d*V" # image.u$2U_v$2V.exr or image.u$Uv$V.exr, etc RX_TILE_REF_VRAY = r"" # image..0001.exr +RX_TILE_VRAY = r"" # image..0001.exr RX_HOUDINI = r"\$F\d*" # image.$F.exr RX_ASTERISK = r"\*+" # image.*.exr RX_UDIM_ZBRUSH = r"u_v" # image.u_v.exr @@ -37,6 +38,7 @@ RX_UDIM_MUDBOX, RX_UDIM_VRAY, RX_TILE_REF_VRAY, + RX_TILE_VRAY, RX_HOUDINI, RX_FRAME_SEQ, RX_ASTERISK, diff --git a/installers/rpm/build.sh b/installers/rpm/build.sh index 976aeef5..94ac0f39 100755 --- a/installers/rpm/build.sh +++ b/installers/rpm/build.sh @@ -31,7 +31,7 @@ curl -s -o python.tgz "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tg tar zxf python.tgz Python*/configure --prefix=${RPM_BUILDROOT}/opt/conductor/python && \ make && make install -curl -O "https://bootstrap.pypa.io/2.7/get-pip.py" +curl -O "https://bootstrap.pypa.io/pip/2.7/get-pip.py" ${RPM_BUILDROOT}/opt/conductor/python/bin/python get-pip.py ${RPM_BUILDROOT}/opt/conductor/python/bin/pip install -r ${SRC_DIR}/requirements.txt popd