From ef274fc8b50087bf77c2c1785ec61c09889ccfd7 Mon Sep 17 00:00:00 2001
From: Ivan Smolin <ivan.smolin@touchin.ru>
Date: Wed, 17 May 2017 14:42:17 +0300
Subject: [PATCH] fixes and improvements

---
 README.md                                            | 12 ++++--------
 bootstrap.sh                                         | 11 ++++++++++-
 liftoffrc                                            |  5 ++++-
 setup_config.sh                                      |  7 +++++++
 .../mvvm-swift/<%= test_target_name %>-Info.plist    |  2 +-
 templates/mvvm-swift/AppDelegate.swift               |  1 +
 templates/mvvm-swift/Info.plist                      |  2 +-
 templates/mvvm-swift/setup.sh                        | 11 -----------
 8 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100755 setup_config.sh
 delete mode 100755 templates/mvvm-swift/setup.sh

diff --git a/README.md b/README.md
index 8e4d0e4..03f146a 100644
--- a/README.md
+++ b/README.md
@@ -9,21 +9,17 @@ Template and config files for liftoff
 You need to edit the file named project.rb located in /usr/local/Cellar/liftoff/{lastest version}/rubylib/liftoff/ And add theses lines in function named 'new_app_target' :
 
 ```
-configuration.build_settings['SWIFT_VERSION'] = '3.0'
+configuration.build_settings['SWIFT_VERSION'] = '3.1'
 ```
 
-### Link configs
+### Setup liftoff config
 
 ```sh
-ln -s liftoffrc ~/.liftoffrc
-
-mkdir ~/.liftoff
-
-ln -s lifoffrc/templates/mmvm-swift/ ~/.liftoff/templates
+./setup_config.sh
 ```
 
 ## Bootstrap project:
 
 ```sh
-echo "PROJECT_NAME" | ./bootstrap.sh
+./bootstrap.sh PROJECT_NAME path/to/projects
 ```
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index d9b7e27..3eee520 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-read PROJECT_NAME
+PROJECT_NAME=$1
+PROJECTS_PATH=$2
+
+cd $PROJECTS_PATH
 
 echo $PROJECT_NAME | liftoff
 
@@ -11,3 +14,9 @@ git submodule add --name code-quality https://github.com/TouchInstinct/code-qual
 ln -s code-quality/.swiftlint.yml .swiftlint.yml
 ln -s code-quality/.tailor.yml .tailor.yml
 ln -s code-quality/cpd_script.php cpd_script.php
+
+git add .swiftlint.yml
+git add .tailor.yml
+git add cpd_script.php
+
+git commit --amend -m "Initial commit"
diff --git a/liftoffrc b/liftoffrc
index d832f30..f9c15e5 100644
--- a/liftoffrc
+++ b/liftoffrc
@@ -24,7 +24,6 @@ run_script_phases:
     name: Tailor
 
 templates:
-  - setup.sh: scripts/setup
   - README.md: README.md
   - Rambafile.template: Rambafile
 
@@ -45,6 +44,7 @@ warnings:
   - GCC_WARN_UNDECLARED_SELECTOR
   - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF
   - GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS
+  - GCC_NO_COMMON_BLOCKS
   - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS
   - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF
   - CLANG_WARN_IMPLICIT_SIGN_CONVERSION
@@ -53,6 +53,9 @@ warnings:
   - CLANG_WARN_ENUM_CONVERSION
   - CLANG_WARN_INT_CONVERSION
   - CLANG_WARN_CONSTANT_CONVERSION
+  - CLANG_WARN_INFINITE_RECURSION
+  - CLANG_WARN_SUSPICIOUS_MOVE
+  - ENABLE_STRICT_OBJC_MSGSEND
 
 xcode_command: open -a 'Xcode' .
 
diff --git a/setup_config.sh b/setup_config.sh
new file mode 100755
index 0000000..fa972dd
--- /dev/null
+++ b/setup_config.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+ln -s $(pwd)/liftoffrc ~/.liftoffrc
+
+mkdir ~/.liftoff
+
+ln -s $(pwd)/templates/mvvm-swift/ ~/.liftoff/templates
\ No newline at end of file
diff --git a/templates/mvvm-swift/<%= test_target_name %>-Info.plist b/templates/mvvm-swift/<%= test_target_name %>-Info.plist
index 4aa72f1..169b6f7 100755
--- a/templates/mvvm-swift/<%= test_target_name %>-Info.plist	
+++ b/templates/mvvm-swift/<%= test_target_name %>-Info.plist	
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string><%= company_identifier %>.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/templates/mvvm-swift/AppDelegate.swift b/templates/mvvm-swift/AppDelegate.swift
index 7c7d438..6cc2d4f 100755
--- a/templates/mvvm-swift/AppDelegate.swift
+++ b/templates/mvvm-swift/AppDelegate.swift
@@ -13,4 +13,5 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         return true
     }
+
 }
diff --git a/templates/mvvm-swift/Info.plist b/templates/mvvm-swift/Info.plist
index 1b94e6a..bc8f3ff 100755
--- a/templates/mvvm-swift/Info.plist
+++ b/templates/mvvm-swift/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string><%= company_identifier %>.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/templates/mvvm-swift/setup.sh b/templates/mvvm-swift/setup.sh
deleted file mode 100755
index b9848de..0000000
--- a/templates/mvvm-swift/setup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-<% if dependency_manager_enabled?("bundler") %>
-bundle install
-<% end %>
-<% if enable_settings && dependency_manager_enabled?("cocoapods") %>
-pod install
-<% end %>
-<% if dependency_manager_enabled?("carthage") %>
-carthage update
-<% end %>