From 0248df6e570e1589f578f42f2f8a35fc8034b1db Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 14 Oct 2022 11:54:24 +0100 Subject: [PATCH 1/6] fix DP-911 --- debian/movai-flow.postrm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/movai-flow.postrm b/debian/movai-flow.postrm index 0b457a8..255f21e 100644 --- a/debian/movai-flow.postrm +++ b/debian/movai-flow.postrm @@ -41,7 +41,7 @@ if [ "$1" = "purge" ]; then $DOCKER_BIN volume rm $volumes 2>/dev/null fi - images=$($DOCKER_BIN images | awk '$1 ~ "mov.ai" { print $3 }') + images=$($DOCKER_BIN images | awk '$1 ~ "mov.ai/ce" { print $3 }') if [ -n "$images" ] then Output "removing docker images" From 95f7a9c1ba9e6caa7598592635e8542fe8aa9139 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 14 Oct 2022 12:03:29 +0100 Subject: [PATCH 2/6] fix DP-915 --- scripts/movai-flow-launch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/movai-flow-launch b/scripts/movai-flow-launch index 8e81654..e03b0f1 100755 --- a/scripts/movai-flow-launch +++ b/scripts/movai-flow-launch @@ -150,9 +150,13 @@ user_documents_path=$(xdg-user-dir DOCUMENTS) Output "Creating user and models folder" if [ ! -e "${user_documents_path}/MovaiFlow" ]; then mkdir -p "${user_documents_path}/MovaiFlow" - ln -sf "$APP_PATH/userspace" "${user_documents_path}/MovaiFlow" - ln -sf "$APP_PATH/models_database" "${user_documents_path}/MovaiFlow" - Output "User and models folder ${user_documents_path}/MovaiFlow" + Output "User and models folder created in ${user_documents_path}/MovaiFlow" +fi +if [ ! -e "${user_documents_path}/MovaiFlow/userspace" ]; then + ln -sf "$APP_PATH/userspace" "${user_documents_path}/MovaiFlow/userspace" +fi +if [ ! -e "${user_documents_path}/MovaiFlow/models_database" ]; then + ln -sf "$APP_PATH/models_database" "${user_documents_path}/MovaiFlow/models_database" fi Output "Starting web application" From 1f499f4b0e66751e581c18a3ea164732092e65e7 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 14 Oct 2022 12:08:10 +0100 Subject: [PATCH 3/6] fix DP-916 --- scripts/movai-flow-rviz | 2 ++ scripts/movai-flow-simulator | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scripts/movai-flow-rviz b/scripts/movai-flow-rviz index 6464466..fa590ac 100755 --- a/scripts/movai-flow-rviz +++ b/scripts/movai-flow-rviz @@ -56,6 +56,8 @@ fi # Check NVIDIA Architecture="$(uname -m)" +HaveNvidia=0 +HaveDockerNvidia=0 if [ "$Architecture" = "x86_64" ]; then # Is there a Nvidia card present (possible HW enhanced graphical rendering) [ "$(echo /sys/module/nvidia/drivers/pci:nvidia/*:*:*.*)" != "/sys/module/nvidia/drivers/pci:nvidia/*:*:*.*" ] && HaveNvidia=1 diff --git a/scripts/movai-flow-simulator b/scripts/movai-flow-simulator index c28570d..3fb6569 100755 --- a/scripts/movai-flow-simulator +++ b/scripts/movai-flow-simulator @@ -62,6 +62,8 @@ fi # Check NVIDIA Architecture="$(uname -m)" +HaveNvidia=0 +HaveDockerNvidia=0 if [ "$Architecture" = "x86_64" ]; then # Is there a Nvidia card present (possible HW enhanced graphical rendering) [ "$(echo /sys/module/nvidia/drivers/pci:nvidia/*:*:*.*)" != "/sys/module/nvidia/drivers/pci:nvidia/*:*:*.*" ] && HaveNvidia=1 From 53a261cd7cfd9ecdc33821abf078c03444ab95e2 Mon Sep 17 00:00:00 2001 From: OttoMation-Movai Date: Fri, 14 Oct 2022 12:13:47 +0100 Subject: [PATCH 4/6] fix DP-917 --- debian/movai-flow.postinst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/movai-flow.postinst b/debian/movai-flow.postinst index 2aa5794..28358eb 100644 --- a/debian/movai-flow.postinst +++ b/debian/movai-flow.postinst @@ -102,7 +102,8 @@ if [ "$1" == "configure" ]; then echo "NETWORK_MODE=" > $CONFIG_PATH/config.env mkdir -p $APP_PATH/{logs,shared,userspace,models_database,config} - chown 1000:1000 $APP_PATH/{logs,shared,userspace,models_database,config} -R + chown 1000:1000 $APP_PATH/{logs,shared,userspace,models_database} -R + chmod 777 $APP_PATH/config -R cp $CONFIG_PATH/config.env $APP_PATH/config/ From 47ef7e3b3cf974d25bf4c0b9361765a5de5f1704 Mon Sep 17 00:00:00 2001 From: Mithun Kinarullathil <51120171+MithunKinarullathil@users.noreply.github.com> Date: Fri, 14 Oct 2022 15:35:32 +0100 Subject: [PATCH 5/6] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c1f6568..7322b2c 100644 --- a/README.md +++ b/README.md @@ -269,4 +269,3 @@ To stop and delete containers, delete volumes with database data and downloaded ## MOV.AI Developer Tools A python package build to facilitate development when using MOV.AI. The tool can be used to, but not limited to, expose the ros topics to the host as well as export/import MOV.AI metadata. Please follow [this link](https://github.com/MOV-AI/movai-developer-tools) for more detailed documentation. - From da81a1273fa487136fb4e89897adda47512c3567 Mon Sep 17 00:00:00 2001 From: Mithun Kinarullathil <51120171+MithunKinarullathil@users.noreply.github.com> Date: Tue, 18 Oct 2022 14:56:37 +0100 Subject: [PATCH 6/6] To trigger pipeline. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 7322b2c..c1f6568 100644 --- a/README.md +++ b/README.md @@ -269,3 +269,4 @@ To stop and delete containers, delete volumes with database data and downloaded ## MOV.AI Developer Tools A python package build to facilitate development when using MOV.AI. The tool can be used to, but not limited to, expose the ros topics to the host as well as export/import MOV.AI metadata. Please follow [this link](https://github.com/MOV-AI/movai-developer-tools) for more detailed documentation. +