|
1 | 1 | #!/bin/bash |
2 | 2 |
|
3 | | -SYSDIG_VERSION="0.27.1" |
4 | | -SYSDIG_VERSION_MAC="0.27.0" |
| 3 | +SYSDIG_VERSION="0.32.1" |
| 4 | +SYSDIG_VERSION_MAC="0.32.1" |
5 | 5 |
|
6 | 6 | # Env parameters |
7 | 7 | # - CLEANUP (default: true) |
@@ -61,22 +61,24 @@ setup_env() { |
61 | 61 | fi |
62 | 62 | if [ -z ${BUILD_NUMBER} ] |
63 | 63 | then |
64 | | - BUILD_NUMBER=42 |
| 64 | + BUILD_NUMBER='' |
| 65 | + else |
| 66 | + BUILD_NUMBER=.${BUILD_NUMBER} |
65 | 67 | fi |
66 | 68 |
|
67 | 69 | set -u |
68 | 70 |
|
69 | 71 | GIT_BRANCHNAME=$(echo ${GIT_BRANCH} | cut -d"/" -f2) |
70 | 72 |
|
71 | | - if [ "${GIT_BRANCHNAME}" = "master" ]; then |
| 73 | + if [ "${GIT_BRANCHNAME}" != "dev" ]; then |
72 | 74 | ENVIRONMENT=production |
73 | 75 | fi |
74 | 76 |
|
75 | | - INSPECT_USER_VERSION=`cat VERSION` |
76 | | - if [ "${ENVIRONMENT}" = "production" ]; then |
77 | | - INSPECT_VERSION=${INSPECT_USER_VERSION} |
| 77 | + INSPECT_USER_VERSION=$(grep '"version"' package.json | cut -d\" -f4) |
| 78 | + if [[ "${ENVIRONMENT}" = "production" ]]; then |
| 79 | + INSPECT_VERSION=${GIT_BRANCHNAME} |
78 | 80 | else |
79 | | - INSPECT_VERSION=${INSPECT_USER_VERSION}.${BUILD_NUMBER} |
| 81 | + INSPECT_VERSION=${INSPECT_USER_VERSION}${BUILD_NUMBER} |
80 | 82 | fi |
81 | 83 |
|
82 | 84 | # Disabling interactive progress bar, and spinners gains 2x performances |
@@ -118,8 +120,11 @@ install_dependencies() { |
118 | 120 |
|
119 | 121 | mkdir -p deps/sysdig-mac |
120 | 122 |
|
121 | | - curl https://download.sysdig.com/dependencies/sysdig-${SYSDIG_VERSION_MAC}-mac.zip -o sysdig.zip |
122 | | - unzip -d deps/sysdig-mac sysdig.zip |
| 123 | + curl -L -o sysdig.dmg "https://github.com/draios/sysdig/releases/download/${SYSDIG_VERSION_MAC}/sysdig-${SYSDIG_VERSION_MAC}-x86_64.dmg" |
| 124 | + 7z x sysdig.dmg || true |
| 125 | + cp -v sysdig-${SYSDIG_VERSION_MAC}-x86_64/bin/sysdig deps/sysdig-mac/ |
| 126 | + cp -v sysdig-${SYSDIG_VERSION_MAC}-x86_64/bin/csysdig deps/sysdig-mac/ |
| 127 | + cp -vr sysdig-${SYSDIG_VERSION_MAC}-x86_64/share/sysdig/chisels deps/sysdig-mac/ |
123 | 128 | fi |
124 | 129 | fi |
125 | 130 | } |
@@ -147,6 +152,10 @@ build() { |
147 | 152 | mkdir -p out/linux/installers |
148 | 153 | cp -r electron-out/make/* out/linux/installers |
149 | 154 | cp -r electron-out/Sysdig\ Inspect-linux-x64/* out/linux/binaries |
| 155 | + cd out/linux/installers |
| 156 | + mv *.rpm sysdig-inspect-linux-x86_64.rpm |
| 157 | + mv *.deb sysdig-inspect-linux-x86_64.deb |
| 158 | + cd - |
150 | 159 | fi |
151 | 160 |
|
152 | 161 | if [ "${BUILD_CONTAINER}" = "true" ]; then |
@@ -196,10 +205,10 @@ build() { |
196 | 205 | zip -ry Sysdig\ Inspect-darwin-x64.zip Sysdig\ Inspect-darwin-x64 |
197 | 206 | cd .. |
198 | 207 | mkdir -p out/mac/binaries |
199 | | - cp electron-out/Sysdig\ Inspect-darwin-x64.zip out/mac/binaries/sysdig-inspect-${INSPECT_VERSION}-mac.zip |
| 208 | + cp electron-out/Sysdig\ Inspect-darwin-x64.zip out/mac/binaries/sysdig-inspect-mac-x86_64.zip |
200 | 209 | if [ "${BUILD_MAC_INSTALLER}" = "true" ]; then |
201 | 210 | mkdir -p out/mac/installers |
202 | | - cp electron-out/make/Sysdig\ Inspect-${INSPECT_USER_VERSION}.dmg out/mac/installers/sysdig-inspect-${INSPECT_VERSION}-mac.dmg |
| 211 | + cp electron-out/make/Sysdig\ Inspect-${INSPECT_USER_VERSION}.dmg out/mac/installers/sysdig-inspect-mac-x86_64.dmg |
203 | 212 | fi |
204 | 213 | fi |
205 | 214 | } |
|
0 commit comments