Adapt scripts

NvimServer

@@ -1 +1 @@
-Subproject commit 0e4cd218d22caccc8545c23431bd35e4a3ef45d8
+Subproject commit d6c47da2257b9b562e6f9cfd39f35d90d511c44c

bin/build_nvimserver_for_local_dev.sh

@@ -14,7 +14,8 @@ build_for_local_dev() {
   local -r nvimserver_path="./NvimServer"
 
   pushd ${nvimserver_path} >/dev/null
-    if ${clean} ; then
+    if [[ ${clean} == true ]]; then
+      local -r -x clean_deps=false
       ./NvimServer/bin/clean_all.sh
     fi
 

bin/build_vimr.sh

@@ -23,17 +23,13 @@ main () {
   echo "### Xcodebuilding"
   rm -rf ${build_path}
 
-  if [[ "${code_sign}" == true ]]; then
-      xcodebuild -configuration Release -derivedDataPath ./build \
-        -workspace VimR.xcworkspace -scheme VimR \
-        clean build
+  xcodebuild -configuration Release -derivedDataPath ${build_path} \
+    -workspace VimR.xcworkspace -scheme VimR \
+    clean build
 
+  if [[ "${code_sign}" == true ]]; then
       local -r -x vimr_app_path="${build_path}/Build/Products/Release/VimR.app"
       ./bin/sign_vimr.sh
-  else
-      xcodebuild -configuration Release -derivedDataPath ${build_path} \
-        -scheme VimR -workspace VimR.xcworkspace \
-        clean build
   fi
 
   echo "### Built VimR target"