forked from jfrog/jfrog-docker-desktop-extension
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bug fix/windows username not recognized (jfrog#107)
* added quotes for windows users with spcaes * added a modification that will maybe work * application now works with usernames with spaces * removed echos and console logs from code
- Loading branch information
Showing
5 changed files
with
26 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
@ECHO OFF | ||
|
||
:: Prints the extension configuration to stdout (in JSON format). | ||
set "HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension" | ||
set "CONF_FILE=%HOME_DIR%\jfrog-docker-desktop-extension.conf" | ||
|
||
set HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension | ||
set CONF_FILE=%HOME_DIR%\jfrog-docker-desktop-extension.conf | ||
|
||
type %CONF_FILE% | ||
:: Use quotes around the CONF_FILE variable to handle paths with spaces. | ||
type "%CONF_FILE%" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,19 @@ | ||
@ECHO OFF | ||
|
||
:: Runs JFrog CLI with the given arguments. The JFrog CLI's home directory is the extension's home directory. | ||
|
||
set HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension | ||
set LOGS_DIR=%HOME_DIR%\logs | ||
|
||
set JFROG_CLI_HOME_DIR=%HOME_DIR% | ||
set "HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension" | ||
set "LOGS_DIR=%HOME_DIR%\logs" | ||
set "JFROG_CLI_HOME_DIR=%HOME_DIR%" | ||
set JFROG_CLI_USER_AGENT=jfrog-docker-extension | ||
set JFROG_CLI_LOG_LEVEL=DEBUG | ||
set CI=true | ||
|
||
if not exist %LOGS_DIR% mkdir %LOGS_DIR% | ||
:: Create logs directory if it doesn't exist, handling paths with spaces. | ||
if not exist "%LOGS_DIR%" mkdir "%LOGS_DIR%" | ||
|
||
:: Get the current datetime in a specific format for the log file name. | ||
for /f "tokens=2 delims==" %%I in ('wmic os get localdatetime /format:list') do set datetime=%%I | ||
set LOG_FILE_PATH=%LOGS_DIR%\jfrog-docker-desktop-extension.%datetime:~0,4%-%datetime:~4,2%-%datetime:~6,2%.%datetime:~8,2%-%datetime:~10,2%.log | ||
|
||
%~dp0jf %* 2>> %LOG_FILE_PATH% | ||
:: Run the JFrog CLI with the given arguments, redirecting stderr to the log file. | ||
"%~dp0/jf" %* 2>> "%LOG_FILE_PATH%" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,9 @@ | ||
@ECHO OFF | ||
|
||
:: Checks whether the user has permissions to run scans in Xray. The return value (in stdout) is the HTTP code returned from Xray. | ||
:: Checks whether the user has permissions to run scans in Xray. | ||
:: The return value (in stdout) is the HTTP code returned from Xray. | ||
set "JFROG_CLI_HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension" | ||
|
||
set JFROG_CLI_HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension | ||
|
||
%~dp0jf xr curl --server-id validation -X POST -H "Content-Type:application/json" -d {\"component_details\":[{\"component_id\":\"testComponent\"}]} api/v1/summary/component -s --output nul -w %%{exitcode},%%{http_code} | ||
:: Run the JFrog CLI with the specified command. | ||
:: Handle paths with spaces by wrapping the command in quotes. | ||
"%~dp0jf" xr curl --server-id validation -X POST -H "Content-Type:application/json" -d "{\"component_details\":[{\"component_id\":\"testComponent\"}]}" api/v1/summary/component -s --output nul -w %%{exitcode},%%{http_code} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,11 @@ | ||
@ECHO OFF | ||
|
||
:: Gets the extension configuration (in JSON format) as an argument and writes it to the configuration file. | ||
set "HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension" | ||
set "CONF_FILE=%HOME_DIR%\jfrog-docker-desktop-extension.conf" | ||
|
||
set HOME_DIR=%USERPROFILE%\.jfrog-docker-desktop-extension | ||
set CONF_FILE=%HOME_DIR%\jfrog-docker-desktop-extension.conf | ||
:: Create the HOME_DIR if it doesn't exist, handling paths with spaces | ||
if not exist "%HOME_DIR%" mkdir "%HOME_DIR%" | ||
|
||
if not exist %HOME_DIR% mkdir %HOME_DIR% | ||
echo %* > %CONF_FILE% | ||
:: Write the provided configuration to the CONF_FILE, handling paths with spaces | ||
echo %* > "%CONF_FILE%" |