Skip to content

Commit

Permalink
Update pod-update script to work if using rbenv instead of RVM.
Browse files Browse the repository at this point in the history
  • Loading branch information
rhgills committed Nov 15, 2013
1 parent 5dfc355 commit cbd1426
Show file tree
Hide file tree
Showing 20 changed files with 13,109 additions and 3,497 deletions.
22 changes: 20 additions & 2 deletions Scripts/pod-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,26 @@ if [ -n "$CHANGED_SOURCE_FILES" ]; then
RVM="${HOME}/.rvm/bin/rvm"
if [ ! -x $RVM ]
then
echo "WARNING: RVM not found in ${RVM}. Unable to locate pod to run ${COMMAND}."
exit 0
echo "WARNING: RVM not found in ${RVM}. Trying to use rbenv..."
RBENV="${HOME}/.rbenv"
if [ ! -x $RBENV ]
then
echo "ERROR: rbenv not found in ${RBENV}. Unable to run ${COMMAND}."
exit 0 # don't screw up people with neither rbenv or RVM
else
# RBENV is a go!
RBENV_COMMAND="${RBENV}/shims/${COMMAND}"
$RBENV_COMMAND
if [ $? -eq 0 ]
then
echo "${COMMAND} succeeded."
exit 0
else
echo "${COMMAND} failed."
exit 1
fi
fi

fi

RVM_COMMAND="$RVM all in $PROJECT_DIR do $COMMAND"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#import "TyphoonInjectionAware.h"
#import "TyphoonParameterInjectedAsCollection.h"
#import "TyphoonInstanceRegister.h"
#import "TyphoonDefinitionRegisterer.h"
#import "TyphoonComponentFactory+TyphoonDefinitionRegisterer.h"

@implementation TyphoonComponentFactory (InstanceBuilder)

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Tests/Pods/BuildHeaders/Typhoon/TyphoonFactoryProvider.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Tests/Pods/Headers/Typhoon/TyphoonAssistedFactoryBase.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Tests/Pods/Headers/Typhoon/TyphoonFactoryProvider.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16,554 changes: 13,070 additions & 3,484 deletions Tests/Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cbd1426

Please sign in to comment.