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

added support for environment variables in leiu of options #105

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added support for environment variables in leiu of options #105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions zigup.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,15 @@ fn getHomeDir() ![]const u8 {
}

fn allocInstallDirString(allocator: Allocator) ![]const u8 {
// TODO: maybe support ZIG_INSTALL_DIR environment variable?
// TODO: maybe support a file on the filesystem to configure install dir?
if(std.os.getenv("ZIG_INSTALL_DIR")) |install_dir| {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

std.os.getenv not working on Windows, but try std.process.getEnvVarOwned is cross-platform.

if (std.fs.path.isAbsolute(install_dir)) {
return install_dir;
} else {
std.log.err("the $ZIG_INSTALL_DIR environment variable '{s}' is not an absolute path", .{install_dir});
return error.BadInstallDirEnvironmentVariable;
}
}
if (builtin.os.tag == .windows) {
const self_exe_dir = try std.fs.selfExeDirPathAlloc(allocator);
defer allocator.free(self_exe_dir);
Expand All @@ -92,7 +99,7 @@ fn allocInstallDirString(allocator: Allocator) ![]const u8 {
std.log.err("$HOME environment variable '{s}' is not an absolute path", .{home});
return error.BadHomeEnvironmentVariable;
}
return std.fs.path.join(allocator, &[_][]const u8{ home, "zig" });
return std.fs.path.join(allocator, &[_][]const u8{ home, "zig" });
}
const GetInstallDirOptions = struct {
create: bool,
Expand All @@ -119,6 +126,9 @@ fn getInstallDir(allocator: Allocator, options: GetInstallDirOptions) ![]const u

fn makeZigPathLinkString(allocator: Allocator) ![]const u8 {
if (global_optional_path_link) |path| return path;
if (std.os.getenv("ZIG_PATH_LINK")) |path_link| {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here!!

return try std.fs.path.join(allocator, &[_][]const u8{ path_link, comptime "zig" ++ builtin.target.exeFileExt() });
}

const zigup_dir = try std.fs.selfExeDirPathAlloc(allocator);
defer allocator.free(zigup_dir);
Expand Down Expand Up @@ -154,10 +164,12 @@ fn help() void {
\\ zigup fetch-index download and print the download index json
\\
\\Common Options:
\\ --install-dir DIR override the default install location
\\ --install-dir DIR override the default install location. For convenience, this
\\ option can be set with the ZIG_INSTALL_DIR environment variable.
\\ --path-link PATH path to the `zig` symlink that points to the default compiler
\\ this will typically be a file path within a PATH directory so
\\ that the user can just run `zig`
\\ that the user can just run `zig`. For convenience, this option
\\ can be set with the ZIG_PATH_LINK environment variable.
\\
) catch unreachable;
}
Expand Down