Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Tools
development-tools
manjaro-tools
Commits
fb989402
Commit
fb989402
authored
Jan 08, 2015
by
udeved
Browse files
clean up some code
parent
a59555f2
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/util-iso.sh
View file @
fb989402
...
...
@@ -462,10 +462,6 @@ make_root_image() {
# Clean up GnuPG keys
rm
-rf
"
${
work_dir
}
/root-image/etc/pacman.d/gnupg"
# Change to given branch in options.conf
#sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman.d/mirrorlist
#sed -i -e "s/stable/$branch/" ${work_dir}/root-image/etc/pacman-mirrors.conf
:
>
${
work_dir
}
/build.
${
FUNCNAME
}
msg
"Done [Base installation] (root-image)"
...
...
@@ -499,7 +495,7 @@ make_de_image() {
umount
-l
${
work_dir
}
/
${
desktop
}
-image
rm
-R
${
work_dir
}
/
${
desktop
}
-image
/.wh
*
#
rm -R ${work_dir}/${desktop}-image/.wh*
:
>
${
work_dir
}
/build.
${
FUNCNAME
}
msg
"Done [
${
desktop
}
installation] (
${
desktop
}
-image)"
fi
...
...
@@ -546,7 +542,7 @@ make_livecd_image() {
umount
-l
${
work_dir
}
/livecd-image
rm
-R
${
work_dir
}
/livecd-image/.wh
*
#
rm -R ${work_dir}/livecd-image/.wh*
:
>
${
work_dir
}
/build.
${
FUNCNAME
}
msg
"Done [livecd-image]"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment