From 85879f1f8157a60fc190eb2731e4edd0deb1dae3 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Wed, 4 Jan 2017 19:51:50 -0500 Subject: [PATCH] Use the installed swift scripts This commit switches how scripts we use to launch the installed version in the path. Previously the scripts were manually executed in the source repo, but this has issues if you're trying to run with py3 in a system where python == py2. Setuptools already does the shebang magic for us at install time, so we just need to use the installed version of the script. Change-Id: Iaa4d80ec607a2aa200400330e16cad3a4ca782ac --- lib/swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/swift b/lib/swift index b175f2e5c1..761ae74b6b 100644 --- a/lib/swift +++ b/lib/swift @@ -809,10 +809,10 @@ function start_swift { local proxy_port=${SWIFT_DEFAULT_BIND_PORT} start_tls_proxy swift '*' $proxy_port $SERVICE_HOST $SWIFT_DEFAULT_BIND_PORT_INT fi - run_process s-proxy "$SWIFT_DIR/bin/swift-proxy-server ${SWIFT_CONF_DIR}/proxy-server.conf -v" + run_process s-proxy "swift-proxy-server ${SWIFT_CONF_DIR}/proxy-server.conf -v" if [[ ${SWIFT_REPLICAS} == 1 ]]; then for type in object container account; do - run_process s-${type} "$SWIFT_DIR/bin/swift-${type}-server ${SWIFT_CONF_DIR}/${type}-server/1.conf -v" + run_process s-${type} "swift-${type}-server ${SWIFT_CONF_DIR}/${type}-server/1.conf -v" done fi