Revert "Merge pull request #914 from qitechgmbh/bin-directory"

This reverts commit aecabfde43, reversing
changes made to b8168c6b43.
This commit is contained in:
rob committed 2025-12-19 14:10:40 +01:00
1 parent dc711a820f
commit 0022d86035
6 files changed
+34 -4

No files matched your search

File renamed without changes.
File renamed without changes.
View File
File renamed without changes.
@@ -177,10 +177,10 @@ async function update(
status: "completed",
});
// 3. make the ./bin/nixos-install script executable (not tracked in progress UI)
// 3. make the nixos-install.sh script executable (not tracked in progress UI)
const chmodResult = await runCommand(
"chmod",
["+x", "./bin/nixos-install"],
["+x", "nixos-install.sh"],
repoDir,
event,
);
@@ -189,7 +189,7 @@ async function update(
return;
}
// 4. run the ./bin/nixos-install script
// 4. run the nixos-install.sh script
// This script will handle rust-build, electron-build, and system-install
// Start with rust-build (cargo builds)
event.sender.send(UPDATE_STEP, {
@@ -198,7 +198,7 @@ async function update(
});
const installResult = await runCommandWithStepTracking(
"./bin/nixos-install",
"./nixos-install.sh",
[],
repoDir,
event,
+30
View File
@@ -0,0 +1,30 @@
touch /tmp/installInfo.nix
# Capture all git information
GIT_TIMESTAMP=$(git --no-pager show -s --format=%cI HEAD) # e.g., "2025-06-10T14:30:45+02:00"
GIT_COMMIT=$(git rev-parse HEAD) # e.g., "b2c7f6e0b138174770798f84ada8b0aa65afeb"
GIT_URL=$(git config --get remote.origin.url) # e.g., "https://github.com/qitechindustries/control.git"
# Determine the git abbreviation (tag, branch, or commit hash)
GIT_TAG=$(git describe --tags --exact-match HEAD 2>/dev/null || echo "")
if [ -n "$GIT_TAG" ]; then
GIT_ABBREVIATION="$GIT_TAG" # e.g., "2.0.0" (when on a tag)
else
GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [ "$GIT_BRANCH" = "HEAD" ]; then
GIT_ABBREVIATION=$(git rev-parse --short HEAD) # e.g., "b2c7f6e" (when on detached HEAD/commit)
else
GIT_ABBREVIATION="$GIT_BRANCH" # e.g., "main", "develop" (when on a branch)
fi
fi
tee /tmp/installInfo.nix > /dev/null << EOF
{
gitTimestamp = "$GIT_TIMESTAMP";
gitCommit = "$GIT_COMMIT";
gitAbbreviation = "$GIT_ABBREVIATION";
gitUrl = "$GIT_URL";
# Like abbreviation but can be used in system.nixos.label
gitAbbreviationEscaped = "$GIT_ABBREVIATION_ESCAPED";
}
EOF
File renamed without changes.