Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix quotes bug #216

Merged
merged 2 commits into from
Aug 10, 2023
Merged

Fix quotes bug #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ecf41b
Update version
Aug 10, 2023
8b3815f
Do not add quotes if present
Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Scripts/Linux/release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ OUT_DIR=$ROOT_DIR/out
RUN_DIR=$OUT_DIR/run

# Cleanup previous runs
tar -a -cf $OUT_DIR/soup-build-0.35.0-linux-x64.tar.gz -C $RUN_DIR .
tar -a -cf $OUT_DIR/soup-build-0.35.1-linux-x64.tar.gz -C $RUN_DIR .
2 changes: 1 addition & 1 deletion Scripts/Linux/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SOURCE_DIR=$ROOT_DIR/Source
GLOBAL_PACKAGES_DIR=~/.soup/packages
GLOBAL_OUT_DIR=~/.soup/out

SOUP_VERSION="0.35.0"
SOUP_VERSION="0.35.1"
COPY_VERSION="1.0.0"
MKDIR_VERSION="1.0.0"
SOUP_CPP_VERSION="0.8.2"
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Windows/install.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ SET RootDir=%ScriptsDir%..\..
SET OutDir=%RootDir%\out

pushd %OutDir%
start msiexec /package soup-build-0.35.0-windows-x64.msi /passive
start msiexec /package soup-build-0.35.1-windows-x64.msi /passive
popd
2 changes: 1 addition & 1 deletion Scripts/Windows/release.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SET RunDir=%OutDir%\run
SET SourceDir=%RootDir%\Source
SET InstallerDir=%SourceDir%\Installer\SoupInstaller

SET SOUP_VERSION=0.35.0
SET SOUP_VERSION=0.35.1

REM - Build MSI Installer
echo msbuild %InstallerDir% -p:Configuration=Release
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Windows/soup.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SET GlobalOutDir=%UserProfile%\.soup\out

SET ConfigHash=Oltq7cGwk0Rbgy1I-3mCMDDE5yM

SET SOUP_VERSION=0.35.0
SET SOUP_VERSION=0.35.1
SET COPY_VERSION=1.0.0
SET MKDIR_VERSION=1.0.0
SET SOUP_CPP_VERSION=0.8.2
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Windows/soupd.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SET GlobalOutDir=%UserProfile%\.soup\out

SET ConfigHash=OZlIVjblazFuKXg-raWUNoGEnG4

SET SOUP_VERSION=0.35.0
SET SOUP_VERSION=0.35.1
SET COPY_VERSION=1.0.0
SET MKDIR_VERSION=1.0.0
SET SOUP_CPP_VERSION=0.8.2
Expand Down
2 changes: 1 addition & 1 deletion Source/Client/CLI/Recipe.sml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: "Soup"
Version: "0.35.0"
Version: "0.35.1"
Language: "C++|0.1"

Type: "Executable"
Expand Down
2 changes: 1 addition & 1 deletion Source/Client/CLI/Source/Commands/VersionCommand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace Soup::Client

// TODO var version = Assembly.GetExecutingAssembly().GetName().Version;
// Log::Message($"{version.Major}.{version.Minor}.{version.Build}");
Log::HighPriority("0.35.0");
Log::HighPriority("0.35.1");
}

private:
Expand Down
2 changes: 1 addition & 1 deletion Source/Installer/SoupInstaller/Setup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Script
{
static public void Main()
{
var soupVersion = new Version(0, 35, 0);
var soupVersion = new Version(0, 35, 1);

var soupOutFolder = "../../../out";
var soupRunFolder = $"{soupOutFolder}/run";
Expand Down
9 changes: 8 additions & 1 deletion Source/Monitor/Host/Windows/WindowsMonitorProcess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,14 @@ namespace Monitor::Windows
std::stringstream argumentsValue;
argumentsValue << "\"" << m_executable.ToAlternateString() << "\"";
for (auto& argument : m_arguments)
argumentsValue << " \"" << argument << "\"";
{
// TODO: Handle quotes better, for now do not add wrapper when double quotes exist
if (argument.find('"') != std::string::npos)
argumentsValue << " " << argument;
else
argumentsValue << " \"" << argument << "\"";
}

std::string argumentsString = argumentsValue.str();

// Setup the input/output streams
Expand Down
Loading