X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=dsfull;h=709ddab407f1163cff037c8efb647701e1d5142a;hb=fd75a734a7149cf203553d36270482af37e680da;hp=f141bc508a2f7a7012f96aaa06ea96f99cee8296;hpb=7815dd8b158226f7186bf987d270b4f824902555;p=automated-distro-installer
diff --git a/dsfull b/dsfull
index f141bc5..709ddab 100755
--- a/dsfull
+++ b/dsfull
@@ -1,28 +1,104 @@
-#!/bin/bash -l
+#!/bin/bash
# Copyright (C) 2016 Ian Kelling
-# This program is under GPL v. 3 or later, see
-# distro setup full. (assuming we already synced data files to the host)
+# 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
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+# 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.
+
+if [[ -s ~/.bashrc ]];then . ~/.bashrc;fi
+
+reboot=true
+if [[ $1 == -r ]]; then
+ reboot=false
+ shift
+fi
+
+usage() {
+ cat <