X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=distro-end;h=f66090b0e8976f9c413be6d34094999374353b71;hp=52199b8216d2167f6ee6acd6aa9aa4ff93dadfa1;hb=7e4f3d0a6130b69b7f76a3ff13e510ffbeb1484b;hpb=6f1f8a104c9b38936ade2d27e835479523985133 diff --git a/distro-end b/distro-end index 52199b8..f66090b 100755 --- a/distro-end +++ b/distro-end @@ -1,22 +1,20 @@ #!/bin/bash -l -# Copyright (C) 2016 Ian Kelling - -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# Copyright (C) 2019 Ian Kelling +# SPDX-License-Identifier: AGPL-3.0-or-later ### setup source /a/bin/errhandle/err src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file +if [[ $EUID == 0 ]]; then + echo "$0: error: run as regular user" >&2 + exit 1 +fi + +_errcatch_cleanup() { + echo 1 >~/.local/distro-end +} + # shellcheck source=./pkgs source $src/pkgs @@ -1682,7 +1680,7 @@ e "$end_msg_var" ######### begin stuff belonging at the end ########## - +echo 0 >~/.local/distro-end if $pending_reboot; then echo "$0: pending reboot and then finished. doing it now." s reboot now