From 14a8d68435ffbcb3a9ae706e554696170e8d8931 Mon Sep 17 00:00:00 2001 From: tuxwarrior Date: Tue, 30 Apr 2024 21:34:49 -0500 Subject: [PATCH] 99_download.sh > 99_deploy.sh --- scripts/{99_download.sh => 99_deploy.sh} | 2 +- scripts/curae.sh | 77 ++---------------------- 2 files changed, 5 insertions(+), 74 deletions(-) rename scripts/{99_download.sh => 99_deploy.sh} (98%) diff --git a/scripts/99_download.sh b/scripts/99_deploy.sh similarity index 98% rename from scripts/99_download.sh rename to scripts/99_deploy.sh index 8139728..b18902e 100644 --- a/scripts/99_download.sh +++ b/scripts/99_deploy.sh @@ -2,7 +2,7 @@ # klevstul -echo "<< 99_download.sh >>" +echo "<< 99_deploy.sh >>" user=poq clone_trg=/tmp diff --git a/scripts/curae.sh b/scripts/curae.sh index c0d4cbd..97971df 100644 --- a/scripts/curae.sh +++ b/scripts/curae.sh @@ -31,7 +31,7 @@ fi this_file_name=`basename "$0"` if [ $# -lt 1 ]; then - echo "usage: '$this_file_name { dots | uf / upd-full [host] | sw / software [host] | us / upd-self | wp }'" + echo "usage: '$this_file_name { dots | uf / upd-full [host] | sw / software {setup/install} [host] | us / upd-self | wp }'" exit 1 fi @@ -59,54 +59,19 @@ execute_script() { /tmp/${file} ${parameter_1} ${parameter_2} } + # ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -# build package -#shopt -s extglob -#if [ $operation == "pkg-build" ] ; then -# -# if [ -z "${extra_parameter}" ]; then -# echo "error: missing package name" -# exit 1 -# fi -# -# package_dir=${pkgs_dir}/${extra_parameter} -# -# if ! [ -d "${package_dir}" ] ; then -# echo "invalid path: '${package_dir}'" -# exit 1 -# fi -# -# echo "building package with path: '${package_dir}'" -# cd ${package_dir} -# nix-build -A ${extra_parameter} -# cd - -# -#fi -#shopt -u extglob - -# update cfg/dot files -#shopt -s extglob -#if [ $operation == "u" ] || [ $operation == "upd-dots" ] ; then -# -# execute_script 10_download_files.sh "dots-all" -# -# tree -D /etc/nixos -# -#fi -#shopt -u extglob # update dot files shopt -s extglob if [ $operation == "dots" ] ; then - execute_script 99_download.sh dots + execute_script 99_deploy.sh dots fi shopt -u extglob - - # install software (update system) shopt -s extglob if [ $operation == "sw" ] || [ $operation == "software" ] ; then @@ -151,41 +116,7 @@ shopt -u extglob shopt -s extglob if [ $operation == "wp" ] ; then - execute_script 99_download.sh wp + execute_script 99_deploy.sh wp fi shopt -u extglob - - -# update and rebuild (all) without hostname -#shopt -s extglob -#if [ $operation == "ur" ] || [ $operation == "upd-rebuild" ] ; then -# -# ${home_dir}/${this_file} upd-dots -# ${home_dir}/${this_file} rebuild ${extra_parameter} -# -#fi -#shopt -u extglob - -# rebuild system with hostname -#shopt -s extglob -#if [ $operation == "rh" ] || [ $operation == "rebuildh" ] ; then -# -# if [ -z "${extra_parameter}" ]; then -# echo "error: missing host name" -# exit 1 -# fi -# -# nixos-rebuild switch -v --show-trace --flake /etc/nixos#${extra_parameter} -# -#fi -#shopt -u extglob - -# rebuild system without hostname -#shopt -s extglob -#if [ $operation == "r" ] || [ $operation == "rebuild" ] ; then -# -# nixos-rebuild switch -v --show-trace -# -#fi -#shopt -u extglob