kintsugi 0.4.0 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/kintsugi/cli.rb +3 -0
- data/lib/kintsugi/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7efc466f1583ea53deda2b4e77f030a1072ac4e93f8d8687f5eca22e2ea1d60c
|
|
4
|
+
data.tar.gz: 0c9dd29ad25b68fbb8c7d2b3b7ce4113e95a341234edaa3d3e11277dd691fc04
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ee93b9b5f72d5ab35fb37a6fcc5464815e9ea13a9a985296d9132bd04be02edc9f542564b6cf5f495bc1a680b9b06a317bed0c709347ca641f5b31bb3145796e
|
|
7
|
+
data.tar.gz: c89520181be68ea61548b989a957e3d7fea7cef637b5a5cfa962ca3634b1db8d0e85906f947ea8868fa3a7ec5feed558d0ea156a77887f59d1123e4865bc6062
|
data/lib/kintsugi/cli.rb
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
# Created by Ben Yohay.
|
|
3
3
|
# frozen_string_literal: true
|
|
4
4
|
|
|
5
|
+
require "fileutils"
|
|
5
6
|
require "optparse"
|
|
6
7
|
|
|
7
8
|
require_relative "version"
|
|
@@ -98,6 +99,8 @@ module Kintsugi
|
|
|
98
99
|
`git config --global merge.kintsugi.driver "kintsugi driver %O %A %B %P"`
|
|
99
100
|
|
|
100
101
|
attributes_file_path = global_attributes_file_path
|
|
102
|
+
FileUtils.mkdir_p(File.dirname(attributes_file_path))
|
|
103
|
+
|
|
101
104
|
merge_using_kintsugi_line = "'*.pbxproj merge=kintsugi'"
|
|
102
105
|
`grep -sqxF #{merge_using_kintsugi_line} "#{attributes_file_path}" \
|
|
103
106
|
|| echo #{merge_using_kintsugi_line} >> "#{attributes_file_path}"`
|
data/lib/kintsugi/version.rb
CHANGED