diff --git a/conf.d/downloads b/conf.d/downloads index 2c71c85..dadb0e7 100755 --- a/conf.d/downloads +++ b/conf.d/downloads @@ -1,12 +1,7 @@ #!/bin/bash -ex -dl() { - [ "$FAB_HTTP_PROXY" ] && PROXY="--proxy $FAB_HTTP_PROXY" - cd $2; curl -L -f -O $PROXY $1; cd - -} +URL="https://github.com/appflower/appflower_studio_playground/archive/v1.3.0.tar.gz" -VERSION="1.3" -URL="http://cdn.appflower.com/appflower_studio_playground_vendors-${VERSION}.tgz" - -dl $URL /usr/local/src +[ "$FAB_HTTP_PROXY" ] && PROXY="--proxy $FAB_HTTP_PROXY" +curl -L -f $PROXY "$URL" -o /usr/local/src/appflower.tar.gz diff --git a/conf.d/main b/conf.d/main index 8e3d009..80f6315 100755 --- a/conf.d/main +++ b/conf.d/main @@ -11,9 +11,9 @@ SRC=/usr/local/src WEBROOT=/var/www/appflower # unpack -tar -zxf $SRC/appflower_studio_playground_vendors-*.tgz -C $(dirname $WEBROOT) -mv $(dirname $WEBROOT)/appflower_studio_playground $WEBROOT -rm $SRC/appflower_studio_playground_vendors-*.tgz +tar -zxf $SRC/appflower.tar.gz -C $(dirname $WEBROOT) +mv $(dirname $WEBROOT)/appflower_* $WEBROOT +rm $SRC/appflower.tar.gz chown -R root:root $WEBROOT # php tweaks