From 95f9793c7ce0ec17eb0c66b579bb809765165fe5 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sat, 16 Jan 2016 15:28:14 -0500 Subject: cmd/*: Use profile_detect() --- (limited to 'src/cmd') diff --git a/src/cmd/build.sh b/src/cmd/build.sh index 3c40c3c..6b85fad 100644 --- a/src/cmd/build.sh +++ b/src/cmd/build.sh @@ -70,7 +70,7 @@ cmd_build_main() cmd_build_pkg_dir="${arg}" done - profile_set "$(. "${root}/etc/os-release" && printf '%s' "${ID}")" + profile_detect "${root}" if ! [ -d "${cmd_build_pkg_dir}" ]; then error 2 "$(get_msg 'cmd_build_not_a_dir')" \ diff --git a/src/cmd/mkinitramfs.sh b/src/cmd/mkinitramfs.sh index a68467d..0ff0923 100644 --- a/src/cmd/mkinitramfs.sh +++ b/src/cmd/mkinitramfs.sh @@ -57,7 +57,7 @@ cmd_mkinitramfs_main() root="$(block_mount "${dev}")" fi - profile_set "$(. "${root}/etc/os-release" && printf '%s' "${ID}")" + profile_detect "${root}" arch="$(cat "${root}/etc/proteanos_arch")" plat="$(cat "${root}/etc/proteanos_plat")" diff --git a/src/cmd/opkg.sh b/src/cmd/opkg.sh index d416d06..218fb2d 100644 --- a/src/cmd/opkg.sh +++ b/src/cmd/opkg.sh @@ -78,7 +78,7 @@ cmd_opkg_main() fi done - profile_set "$(. "${root}/etc/os-release" && printf '%s' "${ID}")" + profile_detect "${root}" session_begin "${root}" . cmd_opkg_fini false diff --git a/src/cmd/shell.sh b/src/cmd/shell.sh index a8e83ce..f062a0e 100644 --- a/src/cmd/shell.sh +++ b/src/cmd/shell.sh @@ -37,7 +37,7 @@ cmd_shell_main() root="$(block_mount "${dev}")" fi - profile_set "$(. "${root}/etc/os-release" && printf '%s' "${ID}")" + profile_detect "${root}" session_begin "${root}" . : false if [ ${#} -eq 0 ]; then -- cgit v0.9.1