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/ 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" 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" 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