Commit 0575dbb4 authored by YannGarcia's avatar YannGarcia
Browse files

Bug fixed in vagrant/provisioner.bash script

parent af6faeb7

scripts/update_user_name.sh

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,8 +7,8 @@ 
# Usage: sudo ./update_user_name.bash

# Usage: sudo ./update_user_name.bash

# TODO Use git clone in temporary directory

# TODO Use git clone in temporary directory





USER_NAME='s/vagrant/etsi/g'

USER_NAME='s/etsi/vagrant/g'

for i in `find /home/etsi/dev/$1_Its -name "*.cf*"`

for i in `find /home/vagrant/dev/$1 -name "*.cf*"`

do

do

  sed --in-place ${USER_NAME} $i

  sed --in-place ${USER_NAME} $i

done

done

AtsGeoNetworking @ d827c288

Compare 55f6521c to d827c288
Original line number Original line Diff line number Diff line 
Subproject commit 55f6521c6ed265b559de411a72c8745f8c288b0a
 
Subproject commit d827c2881825dd389b2f413e91643f813dd1a107

virtualization/docker/home/etc/init.d/20-eclipse.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ rm -f ./eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz 
if wget --progress=dot:mega $TITAN_URL -OTITAN_Designer_and_Executor_plugin.zip; then

if wget --progress=dot:mega $TITAN_URL -OTITAN_Designer_and_Executor_plugin.zip; then

  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \

  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \

    -destination /home/etsi/frameworks/eclipse \

    -destination /home/etsi/frameworks/eclipse \

    -repository 'jar:file:///home/etsi/frameworks/TITAN_Designer_and_Executor_plugin.zip!/' \

    -repository 'jar:file:///home/etsi/frameworks/TITAN_Designer_and_Executor_plugin.zip' \

    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group

    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group

  rm -f TITAN_Designer_and_Executor_plugin.zip

  rm -f TITAN_Designer_and_Executor_plugin.zip

fi

fi

virtualization/vagrant/provisioner.bash

+7 −7
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ do 
    fi

    fi

    cd -

    cd -

done

done

cd /home/etsi/dev/TTF011_Its/ttcn/LibIts

cd /home/vagrant/dev/TTF011_Its/ttcn/LibIts

git checkout TTF011

git checkout TTF011





cd /home/vagrant/dev/TTF011_Its/scripts

cd /home/vagrant/dev/TTF011_Its/scripts
@@ -146,7 +146,7 @@ coveralls-lcov -h 




cd /home/vagrant

cd /home/vagrant

echo "" >> /home/vagrant/.bashrc 

echo "" >> /home/vagrant/.bashrc 

echo "export LD_LIBRARY_PATH=/home/vagrant/dev/etsi_its/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc 

echo "export LD_LIBRARY_PATH=/home/vagrant/dev/TTF011_Its/lib:$LD_LIBRARY_PATH" >> /home/vagrant/.bashrc 

echo "export PATH=/home/vagrant/bin:$PATH" >> /home/vagrant/.bashrc 

echo "export PATH=/home/vagrant/bin:$PATH" >> /home/vagrant/.bashrc 

echo ". ~/devenv.bash" >> /home/vagrant/.bashrc

echo ". ~/devenv.bash" >> /home/vagrant/.bashrc
@@ -162,8 +162,8 @@ rm -f ./eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz 




if wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_plugin-8.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then

if wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_plugin-8.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then

  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \

  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \

    -destination /home/etsi/frameworks/eclipse \

    -destination /home/vagrant/frameworks/eclipse \

    -repository 'jar:file:///home/etsi/frameworks/TITAN_Designer_and_Executor_plugin.zip!/' \

    -repository 'jar:file:///home/vagrant/frameworks/TITAN_Designer_and_Executor_plugin.zip' \

    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group

    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group

  rm -f TITAN_Designer_and_Executor_plugin.zip

  rm -f TITAN_Designer_and_Executor_plugin.zip

fi

fi
@@ -174,7 +174,7 @@ cd /home/vagrant/dev/TTF011_Its/scripts 
. /home/vagrant/devenv.bash

. /home/vagrant/devenv.bash





# Build ATSs

# Build ATSs

cd /home/etsi/dev/TTF011_Its/

cd /home/vagrant/dev/TTF011_Its/

ATS_LIST="AtsCAM AtsDENM AtsGeoNetworking AtsPki AtsSecurity AtsIS"

ATS_LIST="AtsCAM AtsDENM AtsGeoNetworking AtsPki AtsSecurity AtsIS"

for i in ${ATS_LIST}

for i in ${ATS_LIST}

do

do
@@ -187,13 +187,13 @@ cd ${HOME}/dev/TTF011_Its/scripts 
./update_user_name.sh TTF011_Its

./update_user_name.sh TTF011_Its





# Build ETSI ITS certificate generation tools

# Build ETSI ITS certificate generation tools

cd /home/etsi/dev

cd /home/vagrant/dev

git clone https://forge.etsi.org/rep/ITS/itscertgen.git ./itscertgen

git clone https://forge.etsi.org/rep/ITS/itscertgen.git ./itscertgen

cd ./itscertgen

cd ./itscertgen

cd cshared && make && cd -

cd cshared && make && cd -

cd certgen/ && make && cd -

cd certgen/ && make && cd -

# Generate ETSI ITS certificates

# Generate ETSI ITS certificates

cd /home/etsi/dev/TTF011_Its/data/certificates

cd /home/vagrant/dev/TTF011_Its/data/certificates

make

make





cd ${OLD_PWD}

cd ${OLD_PWD}