diff --git a/src/blenderbim/desktop/Makefile b/src/blenderbim/desktop/Makefile index 4f02ba5295..e17077fae7 100644 --- a/src/blenderbim/desktop/Makefile +++ b/src/blenderbim/desktop/Makefile @@ -9,8 +9,8 @@ install : ${DESTDIR}/share/icons/hicolor/128x128/mimetypes \ ${DESTDIR}/share/applications \ ${DESTDIR}/share/mime/packages - cp blenderbim.sh ${DESTDIR}/bin/ - chmod +x ${DESTDIR}/bin/blenderbim.sh + cp blenderbim ${DESTDIR}/bin/ + chmod +x ${DESTDIR}/bin/blenderbim cp blenderbim.png ${DESTDIR}/share/icons/hicolor/128x128/apps/ cp blenderbim.desktop ${DESTDIR}/share/applications/ cp blenderbim.xml ${DESTDIR}/share/mime/packages/ @@ -20,7 +20,7 @@ install : uninstall : rm -f \ - ${DESTDIR}/bin/blenderbim.sh \ + ${DESTDIR}/bin/blenderbim \ ${DESTDIR}/share/icons/hicolor/128x128/apps/blenderbim.png \ ${DESTDIR}/share/applications/blenderbim.desktop \ ${DESTDIR}/share/mime/packages/blenderbim.xml \ diff --git a/src/blenderbim/desktop/README.md b/src/blenderbim/desktop/README.md index b4727eeda1..a3567de060 100644 --- a/src/blenderbim/desktop/README.md +++ b/src/blenderbim/desktop/README.md @@ -15,7 +15,7 @@ configure associations and icons for a single user by running `make`: Test by running the wrapper script directly, this should launch BlenderBIM with an empty IFC project: - blenderbim.sh + blenderbim This `Makefile` installs files to `~/.local` by default, to install to an alternative location, set `DESTDIR`: diff --git a/src/blenderbim/desktop/blenderbim b/src/blenderbim/desktop/blenderbim new file mode 100755 index 0000000000..1de7b9a710 --- /dev/null +++ b/src/blenderbim/desktop/blenderbim @@ -0,0 +1,16 @@ +#!/bin/bash + +# Wrapper script to launch BlenderBIM. + +# If the `blender` executable can't be found in your PATH environment, set +# BLENDER_EXE to the location of your preferred `blender` executable. + +#BLENDER_EXE=/opt/blender-3.3/blender + +: ${BLENDER_EXE:=blender} + +if [[ $# -eq 1 && -f "$@" ]]; then + "${BLENDER_EXE}" --python-expr 'import bpy; bpy.data.batch_remove(bpy.data.objects); bpy.ops.outliner.orphans_purge(do_local_ids=True, do_linked_ids=True, do_recursive=True); bpy.ops.bim.load_project(filepath="'"$@"'")' +else + "${BLENDER_EXE}" --python-expr 'import bpy; bpy.data.batch_remove(bpy.data.objects); bpy.ops.outliner.orphans_purge(do_local_ids=True, do_linked_ids=True, do_recursive=True); bpy.ops.bim.create_project()' +fi; diff --git a/src/blenderbim/desktop/blenderbim.desktop b/src/blenderbim/desktop/blenderbim.desktop index a56d68e95b..29919736d1 100644 --- a/src/blenderbim/desktop/blenderbim.desktop +++ b/src/blenderbim/desktop/blenderbim.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Terminal=false -Exec=blenderbim.sh %f +Exec=blenderbim %f Name=BlenderBIM Icon=blenderbim X-Desktop-File-Install-Version=0.26 diff --git a/src/blenderbim/desktop/blenderbim.sh b/src/blenderbim/desktop/blenderbim.sh deleted file mode 100755 index cef49bd672..0000000000 --- a/src/blenderbim/desktop/blenderbim.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Wrapper script to launch BlenderBIM. - -# If the `blender` executable can't be found in your PATH environment, set -# BLENDER_EXE to the location of your preferred `blender` executable. - -#BLENDER_EXE=/opt/blender-3.3/blender - -: ${BLENDER_EXE:=blender} - -if [[ $# -eq 1 && -f "$@" ]]; then - "${BLENDER_EXE}" --python-expr 'import bpy; bpy.data.collections.remove(bpy.data.collections[0]); bpy.ops.bim.load_project(filepath="'"$@"'")' -else - "${BLENDER_EXE}" --python-expr 'import bpy; bpy.data.collections.remove(bpy.data.collections[0]); bpy.ops.bim.create_project()' -fi;