From 23d183921105b6400465a17adb181ba53c4b01a4 Mon Sep 17 00:00:00 2001 From: Ray Ozzie Date: Mon, 21 Mar 2016 15:04:58 -0700 Subject: [PATCH] asdf --- install.sh | 10 +++++----- install.sh~ | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index 95d166e..f9e3122 100755 --- a/install.sh +++ b/install.sh @@ -81,12 +81,12 @@ if [ -f ./bin/poly_pkt_fwd ]; then rm ./bin/poly_pkt_fwd; fi ln -s $INSTALL_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd ./bin/poly_pkt_fwd cp -f ./packet_forwarder/poly_pkt_fwd/global_conf.json ./bin/global_conf.json -# Startup shell script - -cp ./start.sh ./bin/start.sh - -# Restore location +# Restore location back to where we started the install popd +# Copy startup shell script to the install directory + +cp ./start.sh $INSTALL_DIR/bin/start.sh + echo "Installation completed." diff --git a/install.sh~ b/install.sh~ index 7fd3781..95d166e 100755 --- a/install.sh~ +++ b/install.sh~ @@ -81,6 +81,12 @@ if [ -f ./bin/poly_pkt_fwd ]; then rm ./bin/poly_pkt_fwd; fi ln -s $INSTALL_DIR/packet_forwarder/poly_pkt_fwd/poly_pkt_fwd ./bin/poly_pkt_fwd cp -f ./packet_forwarder/poly_pkt_fwd/global_conf.json ./bin/global_conf.json +# Startup shell script + +cp ./start.sh ./bin/start.sh + +# Restore location + popd echo "Installation completed."