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

[configs/*] Rename $name -> $iso_name, $version -> $iso_version

Browse Source 
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
This commit is contained in:
Gerardo Exequiel Pozzi 2011-08-29 01:45:49 -03:00
parent 8c995ee657
commit 14903dfc45
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/baseline/build.sh
View File

@ -2,9 +2,9 @@
set -e -u set -e -u
name=archlinux iso_name=archlinux
iso_label="ARCH_$(date +%Y%m)" iso_label="ARCH_$(date +%Y%m)"
version=$(date +%Y.%m.%d) iso_version=$(date +%Y.%m.%d)
install_dir=arch install_dir=arch
arch=$(uname -m) arch=$(uname -m)
work_dir=work work_dir=work
@ -79,7 +79,7 @@ make_prepare() {
# Build ISO # Build ISO
make_iso() { make_iso() {
mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}"
mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${arch}.iso" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${iso_name}-${iso_version}-${arch}.iso"
} }
if [[ $verbose == "y" ]]; then if [[ $verbose == "y" ]]; then

12
configs/releng/build.sh
View File

@ -2,9 +2,9 @@
set -e -u set -e -u
name=archlinux iso_name=archlinux
iso_label="ARCH_$(date +%Y%m)" iso_label="ARCH_$(date +%Y%m)"
version=$(date +%Y.%m.%d) iso_version=$(date +%Y.%m.%d)
install_dir=arch install_dir=arch
arch=$(uname -m) arch=$(uname -m)
work_dir=work work_dir=work
@ -164,7 +164,7 @@ make_prepare() {
make_iso() { make_iso() {
local _iso_type=${1} local _iso_type=${1}
mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}" mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}"
mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${name}-${version}-${_iso_type}-${arch}.iso" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}" "${iso_name}-${iso_version}-${_iso_type}-${arch}.iso"
} }
# Build dual-iso images from ${work_dir}/i686/iso and ${work_dir}/x86_64/iso # Build dual-iso images from ${work_dir}/i686/iso and ${work_dir}/x86_64/iso
@ -208,7 +208,7 @@ make_dual() {
s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/} s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/dual/iso/${install_dir}/boot/syslinux/${_cfg##*/}
done done
mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}/dual" mkarchiso ${verbose} -D "${install_dir}" checksum "${work_dir}/dual"
mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${name}-${version}-${_iso_type}-dual.iso" mkarchiso ${verbose} -D "${install_dir}" -L "${iso_label}" iso "${work_dir}/dual" "${iso_name}-${iso_version}-${_iso_type}-dual.iso"
: > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type} : > ${work_dir}/dual/build.${FUNCNAME}_${_iso_type}
fi fi
} }
@ -298,11 +298,11 @@ case "${command_name}" in
;; ;;
clean_single) clean_single)
rm -rf ${work_dir} rm -rf ${work_dir}
rm -f ${name}-${version}-*-${arch}.iso rm -f ${iso_name}-${iso_version}-*-${arch}.iso
;; ;;
clean_dual) clean_dual)
rm -rf ${work_dir}/dual rm -rf ${work_dir}/dual
rm -f ${name}-${version}-*-dual.iso rm -f ${iso_name}-${iso_version}-*-dual.iso
;; ;;
*) *)
echo "Invalid command name '${command_name}'" echo "Invalid command name '${command_name}'"