fix: make shellcheck happy and use ssh agent fw
This commit is contained in:
@@ -8,7 +8,6 @@ CTX="${WORK_DIR}/ctx"
|
||||
|
||||
IMAGE="docker.io/gentoo/stage3:amd64-desktop-openrc"
|
||||
PROFILE="default/linux/amd64/23.0/desktop"
|
||||
CFLAGS="-O2 -pipe -march=x86-64-v3"
|
||||
|
||||
if [[ ! -d "$REPO/.git" ]]; then
|
||||
git clone "$REPO_URL" "$REPO"
|
||||
@@ -16,7 +15,7 @@ else
|
||||
git -C "$REPO" pull --rebase
|
||||
fi
|
||||
|
||||
echo "Aggregating configuration..."
|
||||
echo "Aggregating config..."
|
||||
rm -rf "$CTX" && mkdir -p "$CTX"/var/lib/portage
|
||||
|
||||
# config types to merge
|
||||
@@ -58,8 +57,6 @@ cp "$REPO/binhost/make.conf" "$CTX/etc/portage/make.conf"
|
||||
{
|
||||
# we don't want build to fail bcs of EULA check..
|
||||
echo 'ACCEPT_LICENSE="*"'
|
||||
echo "CFLAGS=\"$CFLAGS\""
|
||||
echo "CXXFLAGS=\"$CFLAGS\""
|
||||
} >> "$CTX/etc/portage/make.conf"
|
||||
|
||||
echo "Starting Builder..."
|
||||
|
||||
@@ -7,10 +7,10 @@ HOSTNAME_TAG="${HOSTNAME:-$(hostname)}"
|
||||
# remote trigger
|
||||
SERVER_USER="mira"
|
||||
SERVER_IP="192.168.102.148"
|
||||
SERVER_BINHOST_DIR="~/gentoo-pill"
|
||||
SERVER_BINHOST_DIR="$HOME/gentoo-pill"
|
||||
|
||||
HOST_DIR="$PILL_REPO/hosts/$HOSTNAME_TAG"
|
||||
echo "> Syncing configuration for: $HOSTNAME_TAG"
|
||||
echo "Syncing configuration for: $HOSTNAME_TAG"
|
||||
|
||||
if [[ -d "$PILL_REPO/.git" ]]; then
|
||||
git -C "$PILL_REPO" pull --rebase --autostash
|
||||
@@ -21,12 +21,12 @@ fi
|
||||
|
||||
mkdir -p "$HOST_DIR"
|
||||
|
||||
echo "> Syncing World file component..."
|
||||
echo "Syncing World file component..."
|
||||
cp /var/lib/portage/world "$HOST_DIR/world"
|
||||
|
||||
CONFIGS=(package.use package.accept_keywords package.license package.mask package.unmask package.env repos.conf)
|
||||
|
||||
echo "> Syncing Portage components..."
|
||||
echo "Syncing Portage components..."
|
||||
for type in "${CONFIGS[@]}"; do
|
||||
local_src="/etc/portage/$type"
|
||||
repo_dest="$HOST_DIR/$type"
|
||||
@@ -40,21 +40,21 @@ for type in "${CONFIGS[@]}"; do
|
||||
fi
|
||||
done
|
||||
|
||||
echo "> Pushing..."
|
||||
echo "Pushing..."
|
||||
cd "$PILL_REPO"
|
||||
|
||||
if [[ -n $(git status --porcelain) ]]; then
|
||||
git add .
|
||||
git commit -m "sync: $HOSTNAME_TAG $(date +'%Y-%m-%d %H:%M')"
|
||||
git push
|
||||
echo "> Changes pushed successfully."
|
||||
echo "Changes pushed successfully."
|
||||
|
||||
# trigger the remote
|
||||
if [[ -n "$SERVER_IP" ]]; then
|
||||
echo "> Triggering binhost build @ [$SERVER_IP]..."
|
||||
ssh "${SERVER_USER}@${SERVER_IP}" \
|
||||
"cd ${SERVER_BINHOST_DIR} && ./binhost.sh"
|
||||
echo "Triggering binhost build @ [$SERVER_IP]..."
|
||||
ssh -A "${SERVER_USER}@${SERVER_IP}" \
|
||||
"cd \"${SERVER_BINHOST_DIR}\" && ./binhost.sh"
|
||||
fi
|
||||
else
|
||||
echo "> No changes, binhost trig skipped"
|
||||
echo "No changes, binhost trig skipped"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user