diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index e3606ac..5e6de88 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -42,7 +42,6 @@ if [ "$SFPATH" != "$SRPATH" ]; then fi cwdir=$PWD -wdir=$SFPATH set -e @@ -81,6 +80,7 @@ service_WEB=true service_URL=http DOCKERuser="docker" +Wdir=${cwdir}/$IMAGE_local # edit it - EDIT_END @@ -110,21 +110,6 @@ NODENETWORK=${HYBRID_NETWORK} #. ./.env -# ----------------------------------------------- -# -# Find Source path of swarmlab.io script -# -# ---------------------------------------------- - - -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink - DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" - SOURCE="$(readlink "$SOURCE")" - [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located -done -DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" - # ----------------------------------------------- # @@ -133,7 +118,6 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )" # ---------------------------------------------- -#. $DIR/.env # ----------------------------------------------- @@ -353,19 +337,19 @@ fi # you do not need to edit it - BEGIN /bin/mkdir -p $Wdir/project /bin/mkdir -p $Wdir/logs -/bin/cp -rf $DIR/project/bin $Wdir/project -/bin/cp -rf $DIR/project/config $Wdir/project -/bin/cp -f $DIR/$bootstrap $Wdir/$bootstrap -/bin/cp -f $DIR/$hostnames $Wdir/$hostnames -/bin/cp -f $DIR/$hostnames_get $Wdir/$hostnames_get -/bin/cp -f $DIR/ROOT_PASSWORD $Wdir/ROOT_PASSWORD -/bin/cp -rf $DIR/.vimrc $Wdir/.vimrc -/bin/cp -rf $DIR/extrapackages $Wdir -/bin/cp -rf $DIR/setup.sh $Wdir -/bin/cp -rf $DIR/fonts-extra $Wdir -/bin/cp -rf $DIR/docs $Wdir -/bin/cp -rf $DIR/run-gui.sh $Wdir/run-gui.sh -/bin/cp -rf $DIR/install-vim-plugin.sh $Wdir/install-vim-plugin.sh +/bin/cp -rf $SRPATH/project/bin $Wdir/project +/bin/cp -rf $SRPATH/project/config $Wdir/project +/bin/cp -f $SRPATH/$bootstrap $Wdir/$bootstrap +/bin/cp -f $SRPATH/$hostnames $Wdir/$hostnames +/bin/cp -f $SRPATH/$hostnames_get $Wdir/$hostnames_get +/bin/cp -f $SRPATH/ROOT_PASSWORD $Wdir/ROOT_PASSWORD +/bin/cp -rf $SRPATH/.vimrc $Wdir/.vimrc +/bin/cp -rf $SRPATH/extrapackages $Wdir +/bin/cp -rf $SRPATH/setup.sh $Wdir +/bin/cp -rf $SRPATH/fonts-extra $Wdir +/bin/cp -rf $SRPATH/docs $Wdir +/bin/cp -rf $SRPATH/run-gui.sh $Wdir/run-gui.sh +/bin/cp -rf $SRPATH/install-vim-plugin.sh $Wdir/install-vim-plugin.sh # you do not need to edit it - END @@ -373,8 +357,8 @@ fi # EDIT-BEGIN # ############################### -#/bin/cp -rf $DIR/cls $Wdir -#/bin/cp -rf $DIR/latex-all $Wdir/latex-all +#/bin/cp -rf $SRPATH/cls $Wdir +#/bin/cp -rf $SRPATH/latex-all $Wdir/latex-all # ############################### # EDIT-END @@ -453,7 +437,6 @@ networks: EOF -#/bin/cp -rf $DIR/ssh $Wdir cat << EOF > $Wdir/stop.sh ../install/usr/share/swarmlab.io/sec/swarmlab-sec down