Johannes/ISO
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix info message for legacy command

Browse Source 
archiso/mkarchiso:
Change the way _show_config() displays information about the build environment, as displaying a profile directory as a
legacy command to mkarchiso is confusing.
The function now prints a deprecation message if '$command_name' is not a directory (i.e. not a profile).
Remove 'command_' prefix from help output for legacy commands (the prefix is only in use for internal functions).

Relates to !69
Fixes #60
This commit is contained in:
David Runge 2020-09-29 13:14:11 +02:00
parent f34c95797d
commit 2e1ddec0a7
No known key found for this signature in database
GPG Key ID: 7258734B41C31549
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archiso/mkarchiso
View File

@ -115,7 +115,7 @@ usage ${app_name} [options] <profile_dir or legacy_command>
-o <out_dir> Set the output directory -o <out_dir> Set the output directory
Default: '${out_dir}' Default: '${out_dir}'
-p PACKAGE(S) Package(s) to install, can be used multiple times -p PACKAGE(S) Package(s) to install, can be used multiple times
-r <run_cmd> Set a command to be run in chroot (only relevant for for command_run) -r <run_cmd> Set a command to be run in chroot (only relevant for legacy 'run' command)
NOTE: Deprecated, will be removed with archiso v49 NOTE: Deprecated, will be removed with archiso v49
-s <sfs_mode> Set SquashFS image mode (img or sfs) -s <sfs_mode> Set SquashFS image mode (img or sfs)
img: prepare airootfs.sfs for dm-snapshot usage img: prepare airootfs.sfs for dm-snapshot usage
@ -129,17 +129,17 @@ usage ${app_name} [options] <profile_dir or legacy_command>
legacy_command: Legacy build.sh command legacy_command: Legacy build.sh command
NOTE: Deprecated, will be removed with archiso v49 NOTE: Deprecated, will be removed with archiso v49
command_init init
initialize a chroot for building initialize a chroot for building
command_install install
install packages to the chroot install packages to the chroot
command_run run
run a command in the chroot run a command in the chroot
command_prepare prepare
cleanup and prepare the airootfs cleanup and prepare the airootfs
command_pkglist pkglist
create a list of packages installed on the medium create a list of packages installed on the medium
command_iso iso
create the ISO create the ISO
ENDUSAGETEXT ENDUSAGETEXT
printf '%s' "${usagetext}" printf '%s' "${usagetext}"
@ -151,7 +151,7 @@ ENDUSAGETEXT
_show_config() { _show_config() {
local _mode="$1" local _mode="$1"
_msg_info "${app_name} configuration settings" _msg_info "${app_name} configuration settings"
_msg_info " Command: ${command_name}" [[ ! -d "${command_name}" ]] && _msg_info " Legacy Command: ${command_name}"
_msg_info " Architecture: ${arch}" _msg_info " Architecture: ${arch}"
_msg_info " Working directory: ${work_dir}" _msg_info " Working directory: ${work_dir}"
_msg_info " Installation directory: ${install_dir}" _msg_info " Installation directory: ${install_dir}"