Skip to content

Commit

Permalink
gnome2-utils.eclass: add missing '|| die' on pushd/popd
Browse files Browse the repository at this point in the history
Signed-off-by: Gilles Dartiguelongue <[email protected]>
  • Loading branch information
Julian Ospald authored and EvaSDK committed Nov 24, 2015
1 parent 5ec4360 commit f74b640
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions eclass/gnome2-utils.eclass
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ gnome2_environment_reset() {
# This function should be called from pkg_preinst.
gnome2_gconf_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" &> /dev/null
pushd "${ED}" &> /dev/null || die
export GNOME2_ECLASS_SCHEMAS=$(find 'etc/gconf/schemas/' -name '*.schemas' 2> /dev/null)
popd &> /dev/null
popd &> /dev/null || die
}

# @FUNCTION: gnome2_gconf_install
Expand Down Expand Up @@ -200,9 +200,9 @@ gnome2_gconf_uninstall() {
# This function should be called from pkg_preinst.
gnome2_icon_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" &> /dev/null
pushd "${ED}" &> /dev/null || die
export GNOME2_ECLASS_ICONS=$(find 'usr/share/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
popd &> /dev/null
popd &> /dev/null || die
}

# @FUNCTION: gnome2_icon_cache_update
Expand Down Expand Up @@ -321,9 +321,9 @@ gnome2_omf_fix() {
# This function should be called from pkg_preinst.
gnome2_scrollkeeper_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" &> /dev/null
pushd "${ED}" &> /dev/null || die
export GNOME2_ECLASS_SCROLLS=$(find 'usr/share/omf' -type f -name "*.omf" 2> /dev/null)
popd &> /dev/null
popd &> /dev/null || die
}

# @FUNCTION: gnome2_scrollkeeper_update
Expand Down Expand Up @@ -356,9 +356,9 @@ gnome2_scrollkeeper_update() {
# This function should be called from pkg_preinst.
gnome2_schemas_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" &>/dev/null
pushd "${ED}" &>/dev/null || die
export GNOME2_ECLASS_GLIB_SCHEMAS=$(find 'usr/share/glib-2.0/schemas' -name '*.gschema.xml' 2>/dev/null)
popd &>/dev/null
popd &>/dev/null || die
}

# @FUNCTION: gnome2_schemas_update
Expand Down Expand Up @@ -392,9 +392,9 @@ gnome2_schemas_update() {
# This function should be called from pkg_preinst.
gnome2_gdk_pixbuf_savelist() {
has ${EAPI:-0} 0 1 2 && ! use prefix && ED="${D}"
pushd "${ED}" 1>/dev/null
pushd "${ED}" 1>/dev/null || die
export GNOME2_ECLASS_GDK_PIXBUF_LOADERS=$(find usr/lib*/gdk-pixbuf-2.0 -type f 2>/dev/null)
popd 1>/dev/null
popd 1>/dev/null || die
}

# @FUNCTION: gnome2_gdk_pixbuf_update
Expand Down

0 comments on commit f74b640

Please sign in to comment.