diff --git a/cdist/type/__aur/gencode-remote b/cdist/type/__aur/gencode-remote index 9d5dab7..087727d 100755 --- a/cdist/type/__aur/gencode-remote +++ b/cdist/type/__aur/gencode-remote @@ -5,10 +5,12 @@ user="$(cat "$__object/parameter/user")" directory="$(cat "$__object/parameter/directory")/$package" #install dependencies as root -#echo "source $directory/PKGBUILD && pacman -Sy --noconfirm --needed --asdeps \"${makedepends[@]}\"" +echo "grep makedepends $directory/PKGBUILD > $directory/deps;" +echo "source $directory/deps;" +echo 'if [[ !(${#makedepends[@]} -eq 0) ]]; then pacman -Sy --noconfirm --needed --asdeps "${makedepends[@]}"; else echo "no make dependencies"; fi;' #make package as user -echo "su - $user -s /bin/bash -c \"(cd $directory && makepkg -f)\"" +echo "su - $user -s /bin/bash -c \"(cd $directory && makepkg -f)\";" #install package as root -echo "pacman --noconfirm -U $directory/*-x86_64.pkg.*" +echo "pacman --noconfirm -U $directory/*-x86_64.pkg.*;" diff --git a/cdist/type/__aur/nonparallel b/cdist/type/__aur/nonparallel new file mode 100644 index 0000000..e69de29 diff --git a/cdist/type/__manjaro_desktop/manifest b/cdist/type/__manjaro_desktop/manifest index e003cf4..1f9efd9 100644 --- a/cdist/type/__manjaro_desktop/manifest +++ b/cdist/type/__manjaro_desktop/manifest @@ -73,19 +73,17 @@ require="__package/emacs" __git "$home/.emacs.d" --source https://github.com/syl __directory "$home/.emacs.d" --owner $user --group $user --recursive unset CDIST_ORDER_DEPENDENCY -# install aura +# install aur packages aurdir="$home/Projects/AUR" aur_packages=" aura-bin android-studio + ncspot postman-bin + rescrobbled-git " -export CDIST_ORDER_DEPENDENCY=on - for package in $aur_packages do __aur $package --user $user --directory $aurdir done - -unset CDIST_ORDER_DEPENDENCY