diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml index d284f5cc2..e21e72707 100644 --- a/.github/workflows/Windows.yml +++ b/.github/workflows/Windows.yml @@ -36,17 +36,18 @@ jobs: run: | sh scripts/windows/windows_deploy.sh - name: NSIS script - #shell: bash + shell: bash run: | - .\scripts\windows\resources\windows_nsis_script.ps1 src\install\ - #sh scripts/windows/resources/windows_nsis_script.sh + #.\scripts\windows\resources\windows_nsis_script.ps1 src\install\ + sh scripts/windows/resources/windows_nsis_script.sh - name: Create Installer uses: joncloud/makensis-action@v1 with: - script-file: "scripts/windows/resources/meshlab_final.nsi" + script-file: "src/install/meshlab_final.nsi" - name: Rename Installer + shell: bash run: | - Rename-Item -Path scripts\windows\resources\MeshLab${{steps.envs.outputs.date}}.exe -NewName MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe + mv src/install/MeshLab${{steps.envs.outputs.date}}.exe src/MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe - name: Uploading MeshLab Portable uses: actions/upload-artifact@v1 with: @@ -56,7 +57,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: meshlab_windows_installer_cmake - path: scripts/windows/resources/MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe + path: src/MeshLab${{steps.envs.outputs.date}}-windows_cmake.exe windows_build_qmake: name: Build MeshLab (Windows - QMake) diff --git a/scripts/windows/resources/windows_nsis_script.sh b/scripts/windows/resources/windows_nsis_script.sh index 59bffbaba..dfd000abf 100644 --- a/scripts/windows/resources/windows_nsis_script.sh +++ b/scripts/windows/resources/windows_nsis_script.sh @@ -28,4 +28,6 @@ fi VERSION=$(cat $SOURCE_PATH/../ML_VERSION) sed "s%MESHLAB_VERSION%$VERSION%g" $SCRIPTS_PATH/resources/meshlab.nsi > $SCRIPTS_PATH/resources/meshlab_final.nsi -sed -i "s%DISTRIB_PATH%$BUNDLE_PATH%g" $SCRIPTS_PATH/resources/meshlab_final.nsi +sed -i "s%DISTRIB_PATH%.%g" $SCRIPTS_PATH/resources/meshlab_final.nsi + +mv $SCRIPTS_PATH/resources/meshlab_final.nsi $BUNDLE_PATH/