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

postinstall scriptlet syntax error 1.x #1029

Merged
merged 2 commits into from
Oct 30, 2024
Merged

postinstall scriptlet syntax error 1.x #1029

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
c37c3ec
fix postinstall scriptlet syntax
qrkourier Oct 25, 2024
b5dbfe0
catchup v1 postinst scriptlet
qrkourier Oct 25, 2024
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
16 changes: 11 additions & 5 deletions programs/ziti-edge-tunnel/package/deb/postinst.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,18 @@ if [ "$1" = "configure" ]; then
fi
printf '\n'
printf %"$ssize"s | tr " " "-"
echo "@SYSTEMD_SERVICE_NAME@ was installed..."
printf '\n'
if [ -n "$2" ]; then
echo "Completed configuration of @SYSTEMD_SERVICE_NAME@ (previous version: $2)."
else
echo "Completed clean install of @SYSTEMD_SERVICE_NAME@."\
"Get started by adding an identity: Start @SYSTEMD_UNIT_FILE_NAME@ and run:" \
| fold -w $ssize
echo ' ziti-edge-tunnel add --jwt "$(< ziti_id.jwt)" --identity "ziti_id"'
fi
if [ "${service_user}" = "root" ]; then
echo "@SYSTEMD_SERVICE_NAME@ will run as root, since policykit cannot be configured to authorize set-llmnr on this system".
echo "@SYSTEMD_SERVICE_NAME@ will run as root, since policykit cannot be configured to authorize set-llmnr on this system". | fold -w $ssize
fi
echo "First install an OpenZiti identity or enroll token in: @ZITI_IDENTITY_DIR@"
echo "then start or restart this systemd service unit."
printf %"$ssize"s | tr " " "-"
printf '\n'
printf '\n\n'
fi
14 changes: 10 additions & 4 deletions programs/ziti-edge-tunnel/package/rpm/post.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,15 @@ if [ $1 -ne 0 ]; then
fi
printf '\n'
printf %"$ssize"s | tr " " "-"
echo "$SYSTEMD_SERVICE_NAME was installed..."
echo "First install an OpenZiti identity or enroll token in: @ZITI_IDENTITY_DIR@"
echo "then start or restart this systemd service unit."
printf %"$ssize"s | tr " " "-"
printf '\n'
if [ $1 -eq 2 ]; then
echo "Completed configuration of $SYSTEMD_SERVICE_NAME"
elif [ $1 -eq 1 ]; then
echo "Completed clean install of $SYSTEMD_SERVICE_NAME"\
"Get started by adding an identity: Start $SYSTEMD_UNIT_FILE_NAME and run:" \
| fold -w $ssize
echo ' ziti-edge-tunnel add --jwt "$(< ziti_id.jwt)" --identity "ziti_id"'
fi
printf %"$ssize"s | tr " " "-"
printf '\n\n'
fi
Loading