Skip to content

Commit

Permalink
fix vagrant support
Browse files Browse the repository at this point in the history
  • Loading branch information
gbcdev committed Apr 5, 2016
1 parent 30f63e9 commit 0fbff9f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
10 changes: 9 additions & 1 deletion make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ PYTHON_ENV_DIR=$DEST_BIN_DIR/python_env
rm -fr $PYTHON_ENV_DIR
mv virtualenv-$VIRTUALENV_VER $PYTHON_ENV_DIR
cd $PYTHON_ENV_DIR
echo "" >> setup.cfg
echo "[easy_install]" >> setup.cfg
echo "index-url = http://mirrors.aliyun.com/pypi/simple/" >> setup.cfg
echo "" >> setup.cfg
python virtualenv.py gbc
cd gbc
source bin/activate
Expand Down Expand Up @@ -376,7 +380,11 @@ if [ $NEED_COPY_FILES -ne 0 ]; then
cd $SRC_DIR
cp -f start_server stop_server check_server $DEST_DIR
cd $SRC_DIR/bin
cp -f shell_func.sh shell_func.lua start_worker.lua getopt_long $DEST_BIN_DIR
cp -f shell_func.sh shell_func.lua start_worker.lua $DEST_BIN_DIR

if [ $OSTYPE == "MACOS" ]; then
cp -f getopt_long $DEST_BIN_DIR
fi

# copy all configuration files
cp -f $SRC_DIR/conf/* $DEST_DIR/conf/
Expand Down
12 changes: 6 additions & 6 deletions vagrant-support/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ function setup()
ln -s /vagrant/conf /opt/gbc-core/conf
ln -s /vagrant/src /opt/gbc-core/src

ln -s /vagrant/shells/start_server /opt/gbc-core/start_server
ln -s /vagrant/shells/stop_server /opt/gbc-core/stop_server
ln -s /vagrant/shells/check_server /opt/gbc-core/check_server
ln -s /vagrant/start_server /opt/gbc-core/start_server
ln -s /vagrant/stop_server /opt/gbc-core/stop_server
ln -s /vagrant/check_server /opt/gbc-core/check_server

ln -s /vagrant/shells/start_worker.lua /opt/gbc-core/bin/start_worker.lua
ln -s /vagrant/shells/shell_func.sh /opt/gbc-core/bin/shell_func.sh
ln -s /vagrant/shells/shell_func.lua /opt/gbc-core/bin/shell_func.lua
ln -s /vagrant/bin/start_worker.lua /opt/gbc-core/bin/start_worker.lua
ln -s /vagrant/bin/shell_func.sh /opt/gbc-core/bin/shell_func.sh
ln -s /vagrant/bin/shell_func.lua /opt/gbc-core/bin/shell_func.lua

echo ""
ls -lh /opt/gbc-core
Expand Down

0 comments on commit 0fbff9f

Please sign in to comment.