Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for syntax error introduced in previous commit #75

Merged
merged 5 commits into from
Nov 16, 2015
Merged

Fix for syntax error introduced in previous commit #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7742f8c
Merge remote-tracking branch 'homebysix/master'
jgstew Nov 15, 2015
83d849e
Fix for error in previous commit
jgstew Nov 15, 2015
96ac97c
Added Arguments for AutoPkgBESEngine
jgstew Nov 15, 2015
a6c41e8
attempting to add basic be_actions structure
jgstew Nov 15, 2015
13f0367
all arguments added for AutoPkgBESEngine processor
jgstew Nov 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions scripts/recipe_robot_lib/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ def inspect_app(input_path, args, facts):
info_plist = FoundationPlist.readPlist(
input_path + "/Contents/Info.plist")
robo_print("App seems valid", LogLevel.VERBOSE, 4)
except ((ValueError, FoundationPlist.NSPropertyListSerializationException)
as error):
except (ValueError, FoundationPlist.NSPropertyListSerializationException) as error:
raise RoboError("%s doesn't look like a valid app to me." % input_path,
error)

Expand Down
34 changes: 33 additions & 1 deletion scripts/recipe_robot_lib/recipe_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,8 +1188,40 @@ def generate_bigfix_recipe(facts, prefs, recipe):
facts["app_name"])

recipe.append_processor({
"Processor": "BESUploader"
"Processor": "AutoPkgBESEngine",
# TODO: Which arguments do we need to specify here?
# - https://github.com/homebysix/recipe-robot/issues/74
"Arguments": {
"bes_filename": "%NAME%.???",
"bes_version": "%version%",
"bes_title": "Install/Upgrade: Bare Bones %NAME% %version% - Mac OS X",
# TODO: Might be a problem with <![CDATA[ being escaped incorrectly in resulting recipe
"bes_description": "<![CDATA[<P>This task will install/upgrade: %NAME% %version%</p>]]>",
"bes_category": "Software Installers",
"bes_relevance": ['mac of operating system','system version >= "10.6.8"',
'not exists folder "/Applications/%NAME%.app" whose (version of it >= "%version%" as version)'],
"bes_actions": {
"1":{
"ActionName":"DefaultAction",
"ActionNumber":"Action1",
# TODO: The following ActionScript needs to made universal
"ActionScript":"""
delete "/tmp/%NAME%.???"
move "__Download/%NAME%.???" "/tmp/%NAME%.???"

wait /usr/bin/hdiutil attach -quiet -nobrowse -mountpoint "/tmp/%NAME%" "/tmp/%NAME%.???"

continue if {exists folder "/tmp/%NAME%/TextWrangler.app"}

wait /bin/rm -rf "/Applications/TextWrangler.app"
wait /bin/cp -Rfp "/tmp/%NAME%/TextWrangler.app" "/Applications"

wait /usr/bin/hdiutil detach -force "/tmp/%NAME%"
delete "/tmp/%NAME%.???"
"""
}
}
}
})

# TODO: Once everything is working, only give this reminder if missing
Expand Down