From 038077d59598e20e66eb3ff9093a78f12b1e1b4d Mon Sep 17 00:00:00 2001
From: obarun <eric@obarun.org>
Date: Sat, 10 Apr 2021 20:33:33 +1100
Subject: [PATCH] rename 66-update to 66-rebuild
---
.gitignore | 2 +-
package/deps.mak | 12 ++++++------
package/modes | 2 +-
package/targets.mak | 2 +-
src/66/66-rebuild.c | 8 ++++----
src/66/deps-exe/{66-update => 66-rebuild} | 0
6 files changed, 13 insertions(+), 13 deletions(-)
rename src/66/deps-exe/{66-update => 66-rebuild} (100%)
diff --git a/.gitignore b/.gitignore
index b6e615a3..538b695b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@
/66-which
/66-writenv
/66-getenv
-/66-update
+/66-rebuild
/execl-envfile
/execl-subuidgid
/config.mak
diff --git a/package/deps.mak b/package/deps.mak
index 4208d783..1c8441a5 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -28,6 +28,7 @@ src/66/66-inservice.o src/66/66-inservice.lo: src/66/66-inservice.c src/include/
src/66/66-instate.o src/66/66-instate.lo: src/66/66-instate.c src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/state.h src/include/66/utils.h
src/66/66-intree.o src/66/66-intree.lo: src/66/66-intree.c src/include/66/backup.h src/include/66/constants.h src/include/66/enum.h src/include/66/info.h src/include/66/resolve.h src/include/66/tree.h src/include/66/utils.h
src/66/66-parser.o src/66/66-parser.lo: src/66/66-parser.c src/include/66/constants.h src/include/66/parser.h src/include/66/utils.h
+src/66/66-rebuild.o src/66/66-rebuild.lo: src/66/66-rebuild.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/parser.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
src/66/66-scanctl.o src/66/66-scanctl.lo: src/66/66-scanctl.c src/include/66/utils.h
src/66/66-scandir.o src/66/66-scandir.lo: src/66/66-scandir.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h
src/66/66-shutdown.o src/66/66-shutdown.lo: src/66/66-shutdown.c src/include/66/config.h src/include/66/hpr.h
@@ -36,7 +37,6 @@ src/66/66-start.o src/66/66-start.lo: src/66/66-start.c src/include/66/ssexec.h
src/66/66-stop.o src/66/66-stop.lo: src/66/66-stop.c src/include/66/ssexec.h
src/66/66-svctl.o src/66/66-svctl.lo: src/66/66-svctl.c src/include/66/ssexec.h
src/66/66-tree.o src/66/66-tree.lo: src/66/66-tree.c src/include/66/config.h src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/resolve.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
-src/66/66-update.o src/66/66-update.lo: src/66/66-update.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/parser.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
src/extra-tools/66-echo.o src/extra-tools/66-echo.lo: src/extra-tools/66-echo.c
src/extra-tools/66-nuke.o src/extra-tools/66-nuke.lo: src/extra-tools/66-nuke.c
src/extra-tools/66-umountall.o src/extra-tools/66-umountall.lo: src/extra-tools/66-umountall.c src/include/66/config.h
@@ -104,13 +104,13 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree
66-disable: src/66/66-disable.o ${LIB66}
66-enable: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-enable: src/66/66-enable.o ${LIB66}
-66-env: EXTRA_LIBS := -loblibs -lskarnet
+66-env: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-env: src/66/66-env.o ${LIB66}
66-hpr: EXTRA_LIBS := -loblibs -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-hpr: src/66/66-hpr.o ${LIB66} ${LIBUTMPS}
66-info: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-info: src/66/66-info.o ${LIB66}
-66-init: EXTRA_LIBS := -ls6 -loblibs -lskarnet
+66-init: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-init: src/66/66-init.o ${LIB66}
66-inresolve: EXTRA_LIBS := -loblibs -lskarnet
66-inresolve: src/66/66-inresolve.o ${LIB66}
@@ -122,6 +122,8 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree
66-intree: src/66/66-intree.o ${LIB66}
66-parser: EXTRA_LIBS := -loblibs -lskarnet
66-parser: src/66/66-parser.o ${LIB66}
+66-rebuild: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
+66-rebuild: src/66/66-rebuild.o ${LIB66}
66-scanctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-scanctl: src/66/66-scanctl.o ${LIB66}
66-scandir: EXTRA_LIBS := -ls6 -loblibs -lskarnet
@@ -134,12 +136,10 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree
66-start: src/66/66-start.o ${LIB66}
66-stop: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-stop: src/66/66-stop.o ${LIB66}
-66-svctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB}
+66-svctl: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB}
66-svctl: src/66/66-svctl.o ${LIB66}
66-tree: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SPAWN_LIB}
66-tree: src/66/66-tree.o ${LIB66}
-66-update: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
-66-update: src/66/66-update.o ${LIB66}
66-echo: EXTRA_LIBS := -loblibs -lskarnet
66-echo: src/extra-tools/66-echo.o
66-nuke: EXTRA_LIBS :=
diff --git a/package/modes b/package/modes
index dc9e801f..6d14f6bf 100644
--- a/package/modes
+++ b/package/modes
@@ -19,7 +19,7 @@
66-shutdown 0755
66-shutdownd 0755
66-hpr 0755
-66-update 0755
+66-rebuild 0755
66-umountall 0755
66-echo 0755
66-nuke 0755
diff --git a/package/targets.mak b/package/targets.mak
index 133bec71..57c39f19 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -20,7 +20,7 @@ BIN_TARGETS := \
66-shutdown \
66-shutdownd \
66-hpr \
-66-update \
+66-rebuild \
66-umountall \
66-echo \
execl-envfile \
diff --git a/src/66/66-rebuild.c b/src/66/66-rebuild.c
index bac6821a..9a3205fa 100644
--- a/src/66/66-rebuild.c
+++ b/src/66/66-rebuild.c
@@ -1,5 +1,5 @@
/*
- * 66-update.c
+ * 66-rebuild.c
*
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
*
@@ -40,7 +40,7 @@
#include <66/resolve.h>
#include <66/parser.h>
-#define USAGE "66-update [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -d ] tree(s)"
+#define USAGE "66-rebuild [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -d ] tree(s)"
static stralloc WORKDIR = STRALLOC_ZERO ;
static uint8_t DRYRUN = 0 ;
@@ -269,7 +269,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
stralloc tree_enabled = STRALLOC_ZERO ;
ssexec_t info = SSEXEC_ZERO ;
- PROG = "66-update" ;
+ PROG = "66-rebuild" ;
{
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
@@ -543,7 +543,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
cleanup() ;
- log_info(DRYRUN ? drun : "","tree: ",info.treename.s," updated successfully") ;
+ log_info(DRYRUN ? drun : "","tree: ",info.treename.s," rebuild successfully") ;
}
exit:
stralloc_free(&satree) ;
diff --git a/src/66/deps-exe/66-update b/src/66/deps-exe/66-rebuild
similarity index 100%
rename from src/66/deps-exe/66-update
rename to src/66/deps-exe/66-rebuild
--
GitLab