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.

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

don't mix tabs and spaces in bootstrap.sh #1313

Merged
merged 1 commit into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 22 additions & 22 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
from_source=""
if [ "$1" = "-build" ]; then
from_source="t"
from_source="t"
fi

set -e
Expand All @@ -20,28 +20,28 @@
os="$(uname)"
arch="$(uname -m)"
if [ "$from_source" = "" ]; then
echo "Downloading pre-built TigerBeetle binary for your machine."
echo ""
if [ "$os" = "Darwin" ]; then
arch="universal"
os="macos"
elif [ "$os" = "Linux" ]; then
os="linux"
else
echo "Unsupported OS."
exit 1
fi

curl -sLO "https://github.com/tigerbeetle/tigerbeetle/releases/download/$version/tigerbeetle-$arch-$os.zip"
unzip -qo "tigerbeetle-$arch-$os.zip"
chmod +x tigerbeetle
echo "Downloading pre-built TigerBeetle binary for your machine."
echo ""

if [ "$os" = "Darwin" ]; then
arch="universal"
os="macos"
elif [ "$os" = "Linux" ]; then
os="linux"
else
echo "Unsupported OS."
exit 1
fi

curl -sLO "https://github.com/tigerbeetle/tigerbeetle/releases/download/$version/tigerbeetle-$arch-$os.zip"
unzip -qo "tigerbeetle-$arch-$os.zip"
chmod +x tigerbeetle
else
echo "Building TigerBeetle binary from source for your machine."
echo ""
git checkout "$version"
./scripts/install.sh
echo "Building TigerBeetle binary from source for your machine."
echo ""

git checkout "$version"
./scripts/install.sh
fi

echo "Successfully set up $(./tigerbeetle version) at $(pwd)/tigerbeetle.
Expand Down
5 changes: 2 additions & 3 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1287,9 +1287,8 @@ const ShellcheckStep = struct {
.extension = ".sh",
});

try shell.exec("shellcheck {scripts}", .{
.scripts = scripts,
});
try shell.exec("shellcheck {scripts}", .{ .scripts = scripts });
try shell.exec("shellcheck ./bootstrap.sh", .{});
}
};

Expand Down
Loading