diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index feab0077b..5dc361d8e 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -41,16 +41,24 @@ jobs: restore-keys: ${{ runner.os }}-go- - name: Test install CLI - jf - run: sh build/installcli/jf.sh && jf --version + run: | + sh build/installcli/jf.sh + jf --version - name: Test install CLI - jfrog - run: sh build/installcli/jfrog.sh && jfrog --version + run: | + sh build/installcli/jfrog.sh + jfrog --version - name: Test get CLI - jf - run: sh build/getcli/jf.sh && ./jf --version + run: | + sh build/getcli/jf.sh + ./jf --version - name: Test get CLI - jfrog - run: sh build/getcli/jfrog.sh && ./jfrog --version + run: | + sh build/getcli/jfrog.sh + ./jfrog --version - name: Test Build CLI - sh run: | @@ -64,23 +72,14 @@ jobs: ./jf${{ matrix.suite.osSuffix }} --version if: ${{ matrix.suite.os == 'windows' }} - - name: Check if package.json build files changed - id: npm-changed-files - uses: tj-actions/changed-files@v39 - with: - files: build/npm/*/package.json - - name: Test install npm - v2 working-directory: build/npm/v2 run: | npm install - bin/jfrog${{ matrix.suite.osSuffix }} --version - if: steps.npm-changed-files.outputs.any_changed == 'false' + ./bin/jfrog${{ matrix.suite.osSuffix }} --version - name: Test install npm - v2-jf working-directory: build/npm/v2-jf run: | npm install - bin/jf${{ matrix.suite.osSuffix }} --version - if: steps.npm-changed-files.outputs.any_changed == 'false' - + ./bin/jf${{ matrix.suite.osSuffix }} --version diff --git a/build/npm/v2-jf/bin/_ b/build/npm/v2-jf/bin/jf old mode 100644 new mode 100755 similarity index 100% rename from build/npm/v2-jf/bin/_ rename to build/npm/v2-jf/bin/jf diff --git a/build/npm/v2-jf/init.js b/build/npm/v2-jf/init.js index fcfa5405f..4f79dfa4b 100644 --- a/build/npm/v2-jf/init.js +++ b/build/npm/v2-jf/init.js @@ -30,7 +30,7 @@ function downloadWithProxy(myUrl) { method: "CONNECT", path: myUrlParts.hostname + ":443", }) - .on("connect", function (res, socket, head) { + .on("connect", function (res, socket, _) { get( { host: myUrlParts.hostname, @@ -110,12 +110,12 @@ function writeToFile(response) { .on("end", function () { file.end(); if (!process.platform.startsWith("win")) { - chmodSync(filePath, 755); + chmodSync(filePath, '755'); } }) .on("error", function (err) { console.error(err); - }); + }); } function getArchitecture() { @@ -153,4 +153,4 @@ function getFileName() { executable += ".exe"; } return executable; -} +} \ No newline at end of file diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index e3f6cfd3c..e108bcd28 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -2,5 +2,4 @@ "name": "jfrog-cli-v2-jf", "version": "2.49.2", "lockfileVersion": 2, - "requires": true } diff --git a/build/npm/v2/bin/_ b/build/npm/v2/bin/jfrog old mode 100644 new mode 100755 similarity index 100% rename from build/npm/v2/bin/_ rename to build/npm/v2/bin/jfrog diff --git a/build/npm/v2/init.js b/build/npm/v2/init.js index cf676168a..1f919b3da 100644 --- a/build/npm/v2/init.js +++ b/build/npm/v2/init.js @@ -30,7 +30,7 @@ function downloadWithProxy(myUrl) { method: "CONNECT", path: myUrlParts.hostname + ":443", }) - .on("connect", function (res, socket, head) { + .on("connect", function (res, socket, _) { get( { host: myUrlParts.hostname, @@ -110,12 +110,12 @@ function writeToFile(response) { .on("end", function () { file.end(); if (!process.platform.startsWith("win")) { - chmodSync(filePath, 755); + chmodSync(filePath, '755'); } }) .on("error", function (err) { console.error(err); - }); + }); } function getArchitecture() { @@ -153,4 +153,4 @@ function getFileName() { executable += ".exe"; } return executable; -} +} \ No newline at end of file diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index f06edeb41..f7ba33a94 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -2,5 +2,4 @@ "name": "jfrog-cli-v2", "version": "2.49.2", "lockfileVersion": 2, - "requires": true }