mrrl-system-config

commit 9e779f05d492202b3e461aaac143bb01f5aae7b4
parent a4f36429f9597be5ee3f9dcedda6c21175387599
Author: ccx <ccx@te2000.cz>
Date:   Thu,  7 Mar 2024 17:01:11 +0000

fix postinstall argument handling

Diffstat:
M
postinstall
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/postinstall b/postinstall
@@ -101,12 +101,12 @@ setup_fileset() {
 		-a  # TODO compile rsync with ACL support
 		--delete
 		--log-format=$'%i\t%B\t%U:%G\t%M\t%l\t%n'
-		--filter="merge $current/conf/postinstall.rsfilter"
+		--filter="merge config/postinstall.rsfilter"
 		--filter='- *'
 	)
 	$rsync --delete-excluded --log-file $SETUP_DIR/rsync.log.get / $SETUP_DIR/files.pre/ || return $?
 	cp -a --reflink=auto $SETUP_DIR/files.pre $SETUP_DIR/files.post || return $?
-	./command/fsapply $SETUP_DIR/files.post $PWD/conf/postinstall.fileset || exit $?
+	./command/fsapply -x $SETUP_DIR/files.post $PWD/config/postinstall.fileset || exit $?
 	zf_mkdir $SETUP_DIR/files.bak || return $?
 	revert+=( revert_fileset )
 	$rsync --log-file $SETUP_DIR/rsync.log.put $SETUP_DIR/files.post/ / --backup --backup-dir=$SETUP_DIR/files.bak || return $?
@@ -117,7 +117,7 @@ revert_fileset() {
 }
 
 setup_containers() {
-	execlineb -P ./conf/s6-rc-source/containers/up || return $?
+	execlineb -P ./config/s6-rc-source/containers/up || return $?
 }
 
 # main function
@@ -125,9 +125,9 @@ postinstall() {
 	- cd $current
 	typeset -g SETUP_DIR
 	if (( $# )); then
-		SETUP_DIR=$versions/postinstall/$EPOCHSECONDS.${current_env:t}
-	else
 		SETUP_DIR=$versions/postinstall/$EPOCHSECONDS.${current_env:t}..${prev_env:t}
+	else
+		SETUP_DIR=$versions/postinstall/$EPOCHSECONDS.${current_env:t}
 	fi
 	- zf_mkdir -p $SETUP_DIR