Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
452d4040
Commit
452d4040
authored
Jul 03, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[TargetIntegrator] Don't show environment in shell scripts
Closes #1122
parent
beb9c930
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
27 additions
and
2 deletions
+27
-2
CHANGELOG.md
CHANGELOG.md
+5
-0
target_integrator.rb
...ds/installer/user_project_integrator/target_integrator.rb
+2
-0
Pods-resources.sh
.../integration/install_add_pod/after/Pods/Pods-resources.sh
+1
-0
execution_output.txt
spec/integration/install_add_pod/after/execution_output.txt
+2
-1
Pods-SampleApp_1-resources.sh
...custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh
+1
-0
Pods-SampleApp_2-resources.sh
...custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh
+1
-0
Pods-resources.sh
...tion/install_external_source/after/Pods/Pods-resources.sh
+1
-0
Pods-resources.sh
...gration/install_local_source/after/Pods/Pods-resources.sh
+1
-0
Pods-SampleApp_2-resources.sh
...multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
+1
-0
Pods-resources.sh
...ion/install_multiple_targets/after/Pods/Pods-resources.sh
+1
-0
Pods-test-resources.sh
...nstall_multiple_targets/after/Pods/Pods-test-resources.sh
+1
-0
execution_output.txt
...ation/install_multiple_targets/after/execution_output.txt
+2
-1
Pods-resources.sh
spec/integration/install_new/after/Pods/Pods-resources.sh
+1
-0
Pods-resources.sh
...on/install_podfile_callbacks/after/Pods/Pods-resources.sh
+1
-0
Pods-resources.sh
.../integration/install_podspec/after/Pods/Pods-resources.sh
+1
-0
Pods-resources.sh
...tegration/install_remove_pod/after/Pods/Pods-resources.sh
+1
-0
Pods-resources.sh
...ation/install_spec_callbacks/after/Pods/Pods-resources.sh
+1
-0
Pods-OS X App-resources.sh
...on/install_subspecs/after/Pods/Pods-OS X App-resources.sh
+1
-0
Pods-iOS App-resources.sh
...ion/install_subspecs/after/Pods/Pods-iOS App-resources.sh
+1
-0
Pods-resources.sh
spec/integration/update/after/Pods/Pods-resources.sh
+1
-0
No files found.
CHANGELOG.md
View file @
452d4040
...
...
@@ -24,6 +24,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
*
The copy resources shell script now aborts if any error occurs.
[
#1098
](
https://github.com/CocoaPods/CocoaPods/issues/1098
)
*
The output of shell script build phases don't show environment variables
*
anymore to reduce noise.
[
#1122
](
https://github.com/CocoaPods/CocoaPods/issues/1122
)
*
CocoaPods doesn't set anymore the deprecated
`ALWAYS_SEARCH_USER_PATHS`
build
setting.
...
...
lib/cocoapods/installer/user_project_integrator/target_integrator.rb
View file @
452d4040
...
...
@@ -149,6 +149,7 @@ module Pod
native_target
.
new_shell_script_build_phase
(
phase_name
)
path
=
target
.
copy_resources_script_relative_path
phase
.
shell_script
=
%{"#{path}"\n}
phase
.
show_env_vars_in_log
=
'0'
end
end
...
...
@@ -177,6 +178,7 @@ module Pod
exit 1
fi
EOS
phase
.
show_env_vars_in_log
=
'0'
end
end
...
...
spec/integration/install_add_pod/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_add_pod/after/execution_output.txt
View file @
452d4040
...
...
@@ -25,7 +25,8 @@ Downloading dependencies
$ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
> Cloning to Pods folder
$ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_add_pod/Pods/JSONKit"
$ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f"
"ROOT/tmp/install_add_pod/Pods/JSONKit"
Cloning into 'ROOT/tmp/install_add_pod/Pods/JSONKit'...
done.
$ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
...
...
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_1-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_custom_workspace/after/Pods/Pods-SampleApp_2-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_external_source/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_local_source/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_multiple_targets/after/Pods/Pods-SampleApp_2-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_multiple_targets/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_multiple_targets/after/Pods/Pods-test-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_multiple_targets/after/execution_output.txt
View file @
452d4040
...
...
@@ -25,7 +25,8 @@ Downloading dependencies
$ /usr/bin/git rev-list --max-count=1 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce
> Cloning to Pods folder
$ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f" "ROOT/tmp/install_multiple_targets/Pods/JSONKit"
$ /usr/bin/git clone "CACHES_DIR/GitHub/de3e1c97c03ac13b29e7533beea2d2131589900f"
"ROOT/tmp/install_multiple_targets/Pods/JSONKit"
Cloning into 'ROOT/tmp/install_multiple_targets/Pods/JSONKit'...
done.
$ /usr/bin/git checkout -b activated-pod-commit 0aff3deb5e1bb2bbc88a83fd71c8ad5550185cce 2>&1
...
...
spec/integration/install_new/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_podfile_callbacks/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_podspec/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_remove_pod/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_spec_callbacks/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_subspecs/after/Pods/Pods-OS X App-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/install_subspecs/after/Pods/Pods-iOS App-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
spec/integration/update/after/Pods/Pods-resources.sh
View file @
452d4040
#!/bin/sh
set
-e
RESOURCES_TO_COPY
=
${
PODS_ROOT
}
/resources-to-copy-
${
TARGETNAME
}
.txt
>
"
$RESOURCES_TO_COPY
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment