summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2016-01-16 15:28:14 (EST)
committer P. J. McDermott <pj@pehjota.net>2016-01-16 15:28:14 (EST)
commit95f9793c7ce0ec17eb0c66b579bb809765165fe5 (patch)
tree106b70801edb772a64c81d05855210ab8b8e15db
parentc0c320617f580e1bfa5aebca72ec5aeed3276fcf (diff)
cmd/*: Use profile_detect()
-rw-r--r--src/cmd/build.sh2
-rw-r--r--src/cmd/mkinitramfs.sh2
-rw-r--r--src/cmd/opkg.sh2
-rw-r--r--src/cmd/shell.sh2
4 files changed, 4 insertions, 4 deletions
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