Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonnam committed Jun 5, 2018
2 parents e94e1b6 + 0b20747 commit 90e7039
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
11 changes: 1 addition & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
language: objective-c
osx_image: xcode9.3

script:
- make release
before_deploy:
- sh Scripts/create_tag.sh
deploy:
provider: releases
api_key:
secure: vuw7o6QyCEo1M/V3IexPyRE20hkUO90SrwqHe5rI6+6RR3X9PIrqRYfo9sWmwtU0uv8dK6nqwPLXzkcF4/xHFXa8rGt+0HTd15+qtBwE+zSx/IfG7MXf2acIuPszXJwv6y6kyp5c4PB1euJsu2541ISW8TOtNO68VSXTBdzyxyA8w5c96Sg71XFHM5lPkg/Fnqw/JhcbUAG1/ICgxncWhvoY9qDJ2bE+oL7hIXvdZAK5lGu1F2zLVeKzaVkmFv8Wkcai1VIMMpKE7JJciC0KrmL2beE9QgzUUVk40DqOYZR8PJqpH3L9q74lBqqN8aIMlVThfABDRaliD+NTSvU5kIBlxfKsrbwCgohUmX89Z3zqJZmxSujy1jTCsTH7FCcZy9NdqYYOehtOEogGaa282cp9FjTEv6bfac27ZzH/AS6QWRUPr0qLbBfDgL/3379yjUctasfSoKozb2OI4xVaHNLQT6zVAx6Ha69mx396eX2Udld0Iw6He+uaEPLmzjT9pwN5DhtkBnfxAMidRBTRUE+6uLIzkNja8jjsMtmFI0bU5dE3mvUlL31ojo+mJuVKgflkGlitriAyJpuS5Y9X2bRBG7SrMINkQ5I6rNS3F00gydFt0nTywJdyAPezLD0L9QtGBpo6WWy7V/o1VEX+TCgp6oMleEHXyzx2yIBJTFA=
file: ".build/release/flint"
skip_cleanup: true
on:
branch: master
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,10 @@ Posthook scripts. These scripts will be executed in sequence after the variables

Actual template files to be copied. Name of file and folder or content of file can have variables.

Available variable formats
*Available variable formats*
- `__VARIABLE_NAME__`
- `___VARIABLE_NAME___`
- `--VARIABLE_NAME--`
- `{{VARIABLE_NAME}}`

### prehook
Expand Down
1 change: 1 addition & 0 deletions Sources/Flint/Convenience/processString.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ func process(_ string: String, variables: [Variable], inputs: [String: String])
guard let value = inputs[variable.name] ?? variable.defaultValue else { continue }
string = string.replacingOccurrences(of: "___\(variable.name)___", with: value)
string = string.replacingOccurrences(of: "__\(variable.name)__", with: value)
string = string.replacingOccurrences(of: "--\(variable.name)--", with: value)
string = string.replacingOccurrences(of: "{{\(variable.name)}}", with: value)
}
return string
Expand Down

0 comments on commit 90e7039

Please sign in to comment.