PKGBUILD now only downloads the needed dependencies

2 files changed, 40 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97259b231018..932a0e3e3d49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = vim-youcompleteme-git
 	pkgdesc = A code-completion engine for Vim
 	pkgver = r2393.487b8ab2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://valloric.github.com/YouCompleteMe/
 	install = install.sh
 	arch = i686
 	arch = x86_64
 	groups = vim-plugins
 	license = GPL3
-	makedepends = cargo
 	makedepends = cmake
 	makedepends = git
 	makedepends = make
 	makedepends = go
 	makedepends = mono
+	makedepends = cargo
 	makedepends = npm
 	depends = boost
 	depends = boost-libs
diff --git a/PKGBUILD b/PKGBUILD
index ae7e614de6f6..24cc3f726b54 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,6 +16,7 @@
 # Contributor: foobster
 # Contributor: archdria
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
+# Contributor: edacval
 
 
 
@@ -44,14 +45,14 @@ pkgver() {
 	cd "YouCompleteMe" || exit
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
-pkgrel=2
+pkgrel=3
 pkgdesc="A code-completion engine for Vim"
 arch=('i686' 'x86_64')
 url='http://valloric.github.com/YouCompleteMe/'
 license=('GPL3')
 groups=('vim-plugins')
 depends=('boost' 'boost-libs' 'ncurses5-compat-libs' 'python' 'python2' 'nodejs' 'vim' 'clang')
-makedepends=('cargo' 'cmake' 'git' 'make')
+makedepends=('cmake' 'git' 'make')
 install=install.sh
 source=(
 'git+https://github.com/Valloric/YouCompleteMe.git' #ycm
@@ -99,6 +100,7 @@ if [[ "$_rust" == "y" ]]; then
 	source+=( 'git+https://github.com/jwilm/racerd.git')
 	sha256sums+=('SKIP')
 	depends+=('rust')
+	makedepends+=('cargo')
 fi
 
 if [[ "$_tern" == "y" ]]; then
@@ -121,25 +123,25 @@ fi
 #=========================================================================================================#
 
 gitprepare() {
-	local CD_DIR=$1
-	local GIT_PREFIX=$2
+	local cd_dir=$1
+	local git_prefix=$2
 	local c=0
 	for val in "$@" ; do
 		if [ $c -gt 1 ]; then
-			local FEED[$c]=$val
+			local feed[$c]=$val
 		fi
 		c=$(( c + 1 ))
 	done
 
-	cd "$srcdir/$CD_DIR" || exit
+	cd "$srcdir/$cd_dir" || exit
 
 	git submodule init
-	for GITSUBVAR in "${FEED[@]}" ; do
-		git config submodule."$GIT_PREFIX$GITSUBVAR".url "$srcdir/$GITSUBVAR"
+	for gitsubvar in "${feed[@]}" ; do
+		git config submodule."$git_prefix$gitsubvar".url "$srcdir/$gitsubvar"
 	done
 
 	git submodule update
-	unset -v FEED
+	unset -v feed
 }
 #=========================================================================================================#
 #=========================================================================================================#
@@ -157,17 +159,29 @@ prepare() {
 	local YouCompleteMe=("requests-futures" "ycmd")
 	gitprepare "YouCompleteMe" "third_party/" "${YouCompleteMe[@]}"
 
-	local ycmd=("bottle" "python-frozendict" "python-future" "waitress" "OmniSharpServer" "requests" "racerd")
-	if [[ $_gocode == "y" ]]; then
+	local ycmd=("bottle" "python-frozendict" "python-future" "waitress" "requests")
+
+	if [[ "$_gocode" == "y" ]]; then
 		ycmd+=("gocode" "godef")
 	fi
+
+	if [[ "$_omnisharp" == "y" ]]; then
+		ycmd+=("OmniSharpServer")
+	fi
+
+	if [[ "$_rust" == "y" ]]; then
+		ycmd+=("racerd")
+	fi
+
 	gitprepare "YouCompleteMe/third_party/ycmd" "third_party/" "${ycmd[@]}"
 
 	local Jedi=("waitress" "jedi" "bottle" "parso")
 	gitprepare "YouCompleteMe/third_party/ycmd/third_party/jedi" "vendor/" "${Jedi[@]}"
 
-	local OmniSharpServer=("NRefactory" "cecil")
-	gitprepare "YouCompleteMe/third_party/ycmd/third_party/OmniSharpServer" "" "${OmniSharpServer[@]}"
+	if [[ "$_omnisharp" == "y" ]]; then
+		local OmniSharpServer=("NRefactory" "cecil")
+		gitprepare "YouCompleteMe/third_party/ycmd/third_party/OmniSharpServer" "" "${OmniSharpServer[@]}"
+	fi
 }
 
 
@@ -180,7 +194,7 @@ build() {
 	cmake -G "Unix Makefiles" -DUSE_SYSTEM_LIBCLANG="$_use_system_clang" . "$srcdir/YouCompleteMe/third_party/ycmd/cpp"
 	make ycm_core
 
-	if [ "$_omnisharp" = "y" ]; then
+	if [[ "$_omnisharp" = "y" ]]; then
 		msg2 'Building OmniSharp completer...' # BuildOmniSharp()
 		cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/OmniSharpServer" || exit
 		pwd
@@ -189,7 +203,7 @@ build() {
 		msg2 'Skipping OmniSharp completer...'
 	fi
 
-	if [ "$_gocode" = "y" ]; then
+	if [[ "$_gocode" = "y" ]]; then
 		msg2 'Building Gocode completer...' # BuildGoCode()
 		cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/gocode" || exit
 		pwd
@@ -201,7 +215,7 @@ build() {
 		msg2 'Skipping Gocode completer...'
 	fi
 
-	if [ "$_rust" = "y" ]; then
+	if [[ "$_rust" = "y" ]]; then
 		msg2 'Building Rust completer...' # BuildRacerd()
 		cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/racerd" || exit
 		pwd
@@ -210,7 +224,7 @@ build() {
 		msg2 'Skipping Rust completer...'
 	fi
 
-	if [ "$_tern" = "y" ]; then
+	if [[ "$_tern" = "y" ]]; then
 		msg2 'Building Tern completer...' # SetUpTern()
 		cd "$srcdir/YouCompleteMe/third_party/ycmd/third_party/tern_runtime" || exit
 		pwd
@@ -219,7 +233,7 @@ build() {
 		msg2 'Skipping Tern completer...'
 	fi
 
-	if [ "$_java" = "y" ]; then
+	if [[ "$_java" = "y" ]]; then
 		# Remove stale java completer data if any
 		rm -rf "$srcdir/YouCompleteMe/third_party/ycmd/third_party/eclipse.jdt.ls/target/repository"
 		mkdir -p "$srcdir/YouCompleteMe/third_party/ycmd/third_party/eclipse.jdt.ls/target/repository"
@@ -231,7 +245,7 @@ build() {
 package() {
 
 	local vimfiles_dir=usr/share/vim/vimfiles
-	if [ "$_neovim" == "y" ]; then
+	if [[ "$_neovim" == "y" ]]; then
 		vimfiles_dir=usr/share/nvim/runtime
 	fi
 
@@ -246,13 +260,13 @@ package() {
 	cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/"{bottle,parso,frozendict,jedi,python-future,requests,waitress} \
 		"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
 
-	if [ "$_omnisharp" = "y" ]; then
+	if [[ "$_omnisharp" = "y" ]]; then
 		mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/OmniSharpServer/OmniSharp/bin/Release"
 		cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/OmniSharpServer/OmniSharp/bin/Release" \
 			"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/OmniSharpServer/OmniSharp/bin"
 	fi
 
-	if [ "$_gocode" = "y" ]; then
+	if [[ "$_gocode" = "y" ]]; then
 		mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/gocode"
 		mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/godef"
 		cp    "$srcdir/YouCompleteMe/third_party/ycmd/third_party/gocode/gocode" \
@@ -261,18 +275,18 @@ package() {
 			"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/godef/godef"
 	fi
 
-	if [ "$_rust" = "y" ]; then
+	if [[ "$_rust" = "y" ]]; then
 		mkdir -p "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/racerd/target/release"
 		cp    "$srcdir/YouCompleteMe/third_party/ycmd/third_party/racerd/target/release/racerd" \
 			"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/racerd/target/release/racerd"
 	fi
 
-	if [ "$_tern" = "y" ]; then
+	if [[ "$_tern" = "y" ]]; then
 		cp -r "$srcdir/YouCompleteMe/third_party/ycmd/third_party/tern_runtime" \
 			"$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
 	fi
 
-	if [ "$_java" = "y" ]; then
+	if [[ "$_java" = "y" ]]; then
 		mv "$srcdir/YouCompleteMe/third_party/ycmd/third_party/eclipse.jdt.ls" "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party"
 		# Force the java completion engine to create its workspace at /tmp instead which is writeable by every user
 		ln -sf /tmp "$pkgdir/$vimfiles_dir/third_party/ycmd/third_party/eclipse.jdt.ls/workspace"