root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some var rename

Browse source
This commit is contained in:
udeved 2015-11-30 23:12:27 +01:00
parent a43483349e
commit 7b2135fab1
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/buildiso.in
View file

@ -27,7 +27,7 @@ show_profile(){
if ${verbose};then
msg2 "edition_type: ${edition_type}"
msg2 "work_dir: ${work_dir}"
msg2 "dir_iso: ${dir_iso}"
msg2 "dir_iso: ${iso_dir}"
msg2 "iso_file: ${iso_file}"
msg2 "is_custom_pac_conf: ${is_custom_pac_conf}"
msg2 "initsys: ${initsys}"

4
bin/deployiso.in
View file

@ -24,8 +24,8 @@ show_profile(){
cd ${edition_type}/$1
msg3 "Iso: [$1]"
prepare_transfer "$1"
msg2 "src_tree: ${src_tree}"
msg2 "remote_tree: ${remote_tree}"
msg2 "src_dir: ${src_dir}"
msg2 "remote_dir: ${remote_dir}"
cd ../..
}

16
lib/util-iso.sh
View file

@ -172,7 +172,7 @@ run_xorriso(){
-no-emul-boot -boot-load-size 4 -boot-info-table \
-isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
${efi_boot_args[@]} \
-output "${dir_iso}/${iso_file}" \
-output "${iso_dir}/${iso_file}" \
"${work_dir}/iso/"
}
@ -192,9 +192,9 @@ make_iso() {
msg "Making bootable image"
# Sanity checks
[[ ! -d "${work_dir}/iso" ]] && die "[${work_dir}/iso] doesn't exist. What did you do?!"
if [[ -f "${dir_iso}/${iso_file}" ]]; then
if [[ -f "${iso_dir}/${iso_file}" ]]; then
msg2 "Removing existing bootable image..."
rm -rf "${dir_iso}/${iso_file}"
rm -rf "${iso_dir}/${iso_file}"
fi
run_xorriso
@ -204,7 +204,7 @@ make_iso() {
# $1: file
make_checksum(){
cd ${dir_iso}
cd ${iso_dir}
msg "Creating [${iso_checksum}sum] ..."
local cs=$(${iso_checksum}sum $1)
msg2 "${iso_checksum}sum: ${cs}"
@ -254,7 +254,7 @@ make_image_custom() {
else
local pkgs_file="${iso_name}-${custom}-${dist_release}-${arch}-pkgs.txt"
fi
cp "${path}/${custom}-image-pkgs.txt" ${dir_iso}/${pkgs_file}
cp "${path}/${custom}-image-pkgs.txt" ${iso_dir}/${pkgs_file}
[[ -d ${custom}-overlay ]] && copy_overlay_custom
configure_custom_image "${path}"
${is_custom_pac_conf} && clean_pacman_conf "${path}"
@ -615,16 +615,16 @@ load_profile(){
[[ -d ${work_dir}/root-image ]] && check_chroot_version "${work_dir}/root-image"
dir_iso="${cache_dir_iso}/${edition_type}/$1/${dist_release}/${arch}"
iso_dir="${cache_dir_iso}/${edition_type}/$1/${dist_release}/${arch}"
prepare_dir "${dir_iso}"
prepare_dir "${iso_dir}"
}
compress_images(){
local timer=$(get_timer)
make_iso
make_checksum "${iso_file}"
chown -R "${OWNER}:users" "${dir_iso}"
chown -R "${OWNER}:users" "${iso_dir}"
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer}) minutes"
}

8
lib/util-publish.sh
View file

@ -10,7 +10,7 @@
# GNU General Public License for more details.
create_subtree_ssh(){
local tree=${remote_target}/${remote_project}/${remote_tree}
local tree=${remote_target}/${remote_project}/${remote_dir}
ssh !${remote_user}@${shell_url} [[ ! -d $tree ]] && mkdir -pv $tree
}
@ -24,8 +24,8 @@ create_subtree(){
}
prepare_transfer(){
remote_tree="${edition_type}/$1/${dist_release}/${arch}"
src_tree="${cache_dir_iso}/${remote_tree}"
remote_dir="${edition_type}/$1/${dist_release}/${arch}"
src_dir="${cache_dir_iso}/${remote_dir}"
}
sync_dir(){
@ -34,7 +34,7 @@ sync_dir(){
prepare_transfer "$1"
${remote_create} && create_subtree "$1"
msg "Start upload [$1] ..."
rsync ${rsync_args[*]} ${src_tree}/ ${sf_url}/${remote_tree}/
rsync ${rsync_args[*]} ${src_dir}/ ${sf_url}/${remote_dir}/
msg "Done upload [$1]"
msg3 "Time ${FUNCNAME}: $(elapsed_time ${timer_start}) minutes"
cd ../..