Skip to content

Make a variety of changes #2

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

Open
branson-perreault wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make a variety of changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41fd960
Test commit please ignore
Sep 23, 2016
20d927f
Add create-dmg as submodule
Sep 23, 2016
dcf5f56
Modify create-dmg path to use new submodule
Sep 23, 2016
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: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "create-dmg"]
path = create-dmg
url = https://github.com/andreyvit/create-dmg
4 changes: 2 additions & 2 deletions build_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ sym_pos_x=600
sym_pos_y=200
icon_size=64

/opt/git/create-dmg/create-dmg --volicon $volicon --volname $vol_name --background $background_image --window-pos 200 120 --window-size $backgound_width $background_height --icon-size $icon_size --icon $app $app_pos_x $app_pos_y --app-drop-link $sym_pos_x $sym_pos_y --hide-extension $app $dmg_name PeachyPrinter.app
create-dmg/create-dmg --volicon $volicon --volname $vol_name --background $background_image --window-pos 200 120 --window-size $backgound_width $background_height --icon-size $icon_size --icon $app $app_pos_x $app_pos_y --app-drop-link $sym_pos_x $sym_pos_y --hide-extension $app $dmg_name PeachyPrinter.app


deactivate
deactivate
1 change: 1 addition & 0 deletions create-dmg
Open in desktop
Submodule create-dmg added at 5acf22
2 changes: 1 addition & 1 deletion setup_development_macosx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ python -m compileall venv/lib/python2.7/site-packages/google/
brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gstreamer
pip install pygame

pip install --upgrade --user python -r requirements.txt
pip install --upgrade -r requirements.txt
Copy link
Author

@branson-perreault branson-perreault Sep 23, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, great work me

if [ $? != 0 ]; then
echo -e "${FRED}FAILED TO INSTALL REQUIREMENTS{RS}"
exit 59
Expand Down