diff --git a/lib/linkfunc b/lib/linkfunc index e00396c..9713ac1 100644 --- a/lib/linkfunc +++ b/lib/linkfunc @@ -27,3 +27,7 @@ function link_bash-completion(){ [ -d "$PKGS_DIR/etc/bash_completion.d" ] && ln -s "$PKGS_DIR"/etc/bash_completion.d/* ${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion/completions 2> /dev/null; [ -d "$PKGS_DIR/usr/share/bash-completion/completions" ] && ln -s "$PKGS_DIR"/usr/share/bash-completion/completions/* ${XDG_DATA_HOME:-$HOME/.local/share}/bash-completion/completions 2> /dev/null; } + +function link_icons() { + if [[ -d "${PKG_PATH}/${pkgname}/usr/share/icons" ]]; then say "linking icons directory";ln -s ${PKG_PATH}/${pkgname}/usr/share/icons ${PKG_PREFIX}/share;fi +} diff --git a/lib/pkgfunc b/lib/pkgfunc index 37865fe..e953a7e 100644 --- a/lib/pkgfunc +++ b/lib/pkgfunc @@ -21,8 +21,8 @@ function pkg_install () { source "${PKG_PREFIX}/lib/crackle/${pkgname}"; install_${pkgname}; fi - fetch_desktop ${PKGS_DIR}/usr/share/applications/${pkgname}.desktop ${PKG_PREFIX}/share/applications/crackle.${pkgname}.desktop - if [[ ! -e "${PKGS_DIR}/share/icons" ]]; then link_iconsdir; fi + fetch_desktop ${PKG_PATH}/${pkgname}/usr/share/applications/${pkgname}.desktop ${PKG_PREFIX}/share/applications/crackle.${pkgname}.desktop + if [[ ! -e "${PKG_PATH}/${pkgname}/usr/share/icons" ]]; then link_icons; fi link_bash-completion; } @@ -87,7 +87,3 @@ function fetch_desktop() { echo "X-Ubuntu-Touch=true" >> $2 fi } - -function link_iconsdir() { - if [[ -d "${PKG_PATH}/usr/share/icons" ]]; then say "linking icons directory";ln -s ${PKG_PATH}/usr/share/icons ${PKG_PREFIX}/share;fi -}