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

Use well known location for bundled english content pack #441

Merged
merged 6 commits into from
Mar 30, 2017
Merged

Use well known location for bundled english content pack #441

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
821ca38
Set KALITE_DIR environment variable during post installation.
mrpau-richard Feb 21, 2017
53f57ee
Fix build scripts arrangement.
mrpau-richard Feb 23, 2017
c769a50
Remove KALITE_DIR environment variable during uninstall.
mrpau-richard Feb 23, 2017
8f3cc14
Remove pyrun in the comment.
mrpau-richard Feb 28, 2017
834f602
Fix logs in build script steps.
mrpau-richard Mar 1, 2017
01815b4
Show an echo of the step description.
mrpau-richard Mar 2, 2017
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
53 changes: 27 additions & 26 deletions osx/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,15 @@
# . pkgutil --check-signature KA-Lite.app -- or;
# . spctl --assess --type install KA-Lite.pkg


echo "KA-Lite OS X build script for version 0.17.x and above."

STEP=0
STEPS=15

# TODO(cpauya): get version from `ka-lite/kalite/version.py`
# Set the default value to `develop` as suggested by [@benjaoming](https://github.com/learningequality/ka-lite-installers/pull/433#discussion_r96399812), so we can use the VERSION environment in bamboo settings.
VERSION="0.17.x"
VERSION=${VERSION:-"develop"}

This comment was marked as spam.

Sign in to view


echo "KA-Lite OS X build script for version '$VERSION' and above."

CONTENT_VERSION="0.17"
PANTRY_CONTENT_URL="http://pantry.learningequality.org/downloads/ka-lite/$CONTENT_VERSION/content"

Expand Down Expand Up @@ -177,12 +176,35 @@ test ! -d "$TEMP_OUTPUT_PATH" && mkdir "$TEMP_OUTPUT_PATH"
((STEP++))
PYTHON_DOWNLOAD_URL="https://www.python.org/ftp/python/2.7.12/python-2.7.12-macosx10.6.pkg"

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

cd $TEMP_OUTPUT_PATH
echo "Downloading the minimum requirement of Python Installer at $PYTHON_DOWNLOAD_URL ..."
wget --retry-connrefused --read-timeout=20 --waitretry=1 -t 100 --continue $PYTHON_DOWNLOAD_URL

This comment was marked as spam.

Sign in to view

if [ $? -ne 0 ]; then
echo ".. Abort! Can't download Python at '$PYTHON_DOWNLOAD_URL'"
exit 1
fi

KA_LITE_PROJECT_DIR="$SCRIPTPATH/KA-Lite"
DMG_PATH="$OUTPUT_PATH/KA-Lite-Installer.dmg"
DMG_BUILDER_PATH="$WORKING_DIR/create-dmg"
CREATE_DMG="$DMG_BUILDER_PATH/create-dmg"
KA_LITE_ICNS_PATH="$KA_LITE_PROJECT_DIR/KA-Lite/Resources/images/ka-lite.icns"

test ! -d "$OUTPUT_PATH" && mkdir "$OUTPUT_PATH"

((STEP++))

This comment was marked as spam.

Sign in to view

CREATE_DMG_ZIP="$WORKING_DIR/create-dmg.zip"
CREATE_DMG_URL="https://github.com/mrpau/create-dmg/archive/master.zip"
# clone the .dmg builder if non-existent
if ! [ -d $DMG_BUILDER_PATH ]; then
cd $WORKING_DIR
echo ".. Downloading create dmg library at '$CREATE_DMG_URL'..."
wget --retry-connrefused --read-timeout=20 --waitretry=1 -t 100 --continue -O $CREATE_DMG_ZIP $CREATE_DMG_URL
# Extract KA-Lite
echo ".. Extracting '$CREATE_DMG_ZIP'..."
tar -xf $CREATE_DMG_ZIP -C $WORKING_DIR
mv $WORKING_DIR/create-dmg-* create-dmg
fi

((STEP++))
echo "$STEP/$STEPS. Checking Github source..."

Expand Down Expand Up @@ -358,7 +380,6 @@ fi
# Build the Xcode project
((STEP++))
echo "$STEP/$STEPS. Building the Xcode project..."
KA_LITE_PROJECT_DIR="$SCRIPTPATH/KA-Lite"
if [ -d "$KA_LITE_PROJECT_DIR" ]; then
# MUST: xcodebuild needs to be on the same directory as the .xcodeproj file
cd "$KA_LITE_PROJECT_DIR"
Expand Down Expand Up @@ -423,27 +444,6 @@ else
fi
fi

# Build the .dmg file.
((STEP++))
DMG_PATH="$OUTPUT_PATH/KA-Lite-Installer.dmg"
DMG_BUILDER_PATH="$WORKING_DIR/create-dmg"
CREATE_DMG="$DMG_BUILDER_PATH/create-dmg"
KA_LITE_ICNS_PATH="$KA_LITE_PROJECT_DIR/KA-Lite/Resources/images/ka-lite.icns"

echo "$STEP/$STEPS. Building the .dmg file at '$OUTPUT_PATH'..."
test ! -d "$OUTPUT_PATH" && mkdir "$OUTPUT_PATH"

CREATE_DMG_ZIP="$WORKING_DIR/create-dmg.zip"
# clone the .dmg builder if non-existent
if ! [ -d $DMG_BUILDER_PATH ]; then
cd $WORKING_DIR
wget --retry-connrefused --read-timeout=20 --waitretry=1 -t 100 --continue -O $CREATE_DMG_ZIP https://github.com/mrpau/create-dmg/archive/master.zip
# Extract KA-Lite
echo ".. Extracting '$CREATE_DMG_ZIP'..."
tar -xf $CREATE_DMG_ZIP -C $WORKING_DIR
mv $WORKING_DIR/create-dmg-* create-dmg
fi

# Remove the .dmg if it exists.
test -e "$DMG_PATH" && rm "$DMG_PATH"

Expand All @@ -452,6 +452,7 @@ test -e "$DMG_PATH" && rm "$DMG_PATH"
cp "$SCRIPTPATH/dmg-resources/README.md" "$TEMP_OUTPUT_PATH"
cp "$SCRIPTPATH/dmg-resources/ka-lite-logo.png" "$TEMP_OUTPUT_PATH"

echo "$STEP/$STEPS. Building the .dmg file at '$OUTPUT_PATH'..."
# Let's create the .dmg.
$CREATE_DMG \
--volname "KA Lite Installer" \
Expand Down