swisskyrepo
/
ashirt
mirror of https://github.com/swisskyrepo/ashirt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove OS Name for deployment (#134) 

Co-authored-by: Chris Rizzitello <crizzitello@ics.com>
main
crizzitello 2022-04-14 15:07:10 -04:00 committed by GitHub
parent a3572bf6e3
commit 0be80334cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@ -81,7 +81,7 @@ jobs:
- name: Setup env
shell: bash
run: |
echo "name=ashirt-${{ needs.run-info.outputs.sha8 }}${{matrix.config.QT_STRING}}-$RUNNER_OS" >> $GITHUB_ENV
echo "name=ashirt-${{ needs.run-info.outputs.sha8 }}${{matrix.config.QT_STRING}}" >> $GITHUB_ENV
echo "githash=${{ needs.run-info.outputs.sha8 }}" >> $GITHUB_ENV
echo "signRelease=${{ needs.run-info.outputs.signRelease }}" >> $GITHUB_ENV

2
deploy/CMakeLists.txt
View File

@ -22,7 +22,6 @@ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
STRING(APPEND CPACK_PACKAGE_FILE_NAME "-Qt5")
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
STRING(APPEND CPACK_PACKAGE_FILE_NAME "-Windows")
set(CPACK_PACKAGE_VENDOR "Yahoo")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "ashirt")
set(CPACK_NSIS_DISPLAY_NAME ${CMAKE_PACKAGE_NAME})
@ -40,7 +39,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
)
set(CPACK_GENERATOR "NSIS")
elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
STRING(APPEND CPACK_PACKAGE_FILE_NAME "-macOS")
set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/dmg_icon.icns")
set(CPACK_DMG_BACKGROUND_IMAGE "${PROJECT_SOURCE_DIR}/deploy/dmg_background.png")
set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${PROJECT_SOURCE_DIR}/deploy/generate_ds_store.applescript")