Update out-of-date optionals

This commit is contained in:
Fierelier 2022-08-08 21:20:53 +02:00
parent 85921322c4
commit 256dd3b2f0
2 changed files with 8 additions and 4 deletions

View File

@ -49,7 +49,7 @@ set +e
source apply-mod "$OPUS_HOME/mods/user-config" "$OPUS_IMAGEDIR_FINAL-tmp"
# Raw image
# source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
# source apply-mod "$OPUS_HOME/mods/image-raw" "$OPUS_IMAGEDIR_FINAL-tmp"
# Packages
source apply-mod "$OPUS_HOME/mods/fast-dpkg" "$OPUS_IMAGEDIR_FINAL-tmp"
@ -59,11 +59,13 @@ set +e
source apply-mod "$OPUS_HOME/mods/oobe" "$OPUS_IMAGEDIR_FINAL-tmp"
source apply-mod "$OPUS_HOME/mods/clean-logs" "$OPUS_IMAGEDIR_FINAL-tmp"
mv "$OPUS_IMAGEDIR_FINAL-tmp" "$OPUS_IMAGEDIR_FINAL"
# make-image-raw "$OPUS_IMAGEDIR_FINAL" "$OPUS_HOME/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img"
# make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image
fi
echo ""
echo "Done."
#make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image
)
if [ $? != 0 ]; then
set +e

View File

@ -51,7 +51,7 @@ set +e
source apply-mod "$OPUS_HOME/mods/user-config" "$OPUS_IMAGEDIR_FINAL-tmp"
# Raw image
# source apply-mod "$OPUS_HOME/input/image-raw" "$OPUS_IMAGEDIR"
# source apply-mod "$OPUS_HOME/mods/image-raw" "$OPUS_IMAGEDIR_FINAL-tmp"
# Packages
source apply-mod "$OPUS_HOME/mods/fast-dpkg" "$OPUS_IMAGEDIR_FINAL-tmp"
@ -61,11 +61,13 @@ set +e
source apply-mod "$OPUS_HOME/mods/oobe" "$OPUS_IMAGEDIR_FINAL-tmp"
source apply-mod "$OPUS_HOME/mods/clean-logs" "$OPUS_IMAGEDIR_FINAL-tmp"
mv "$OPUS_IMAGEDIR_FINAL-tmp" "$OPUS_IMAGEDIR_FINAL"
# make-image-raw "$OPUS_IMAGEDIR_FINAL" "$OPUS_HOME/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").img"
# make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image
fi
echo ""
echo "Done."
#make-image-gz "$OPUS_IMAGEDIR" "$OPUS_OUTPUT/${OPUS_NAME}-${OPUS_DIST}-${OPUS_ARCH}_$(date "+%Y.%m.%d-%H.%M.%S").tar.gz" # tar.gz image
)
if [ $? != 0 ]; then
set +e