Ind.ie is now Small Technology Foundation.
Commit 4a3cac9c authored by Aral Balkan's avatar Aral Balkan

Merge branch 'installation-fix' into 'master'

Updated the Safari script to remove symlink creation and replace it with a simple copy.



See merge request !1
parents 16418d4a b2a93d74
......@@ -22,6 +22,11 @@ set -e
#
################################################################################
#
# Properties
#
accountName='better'
#
# Flow
#
......@@ -36,20 +41,35 @@ greetings(){
}
ensureDependenciesExist(){
echo " · This component has no dependencies. Skipping dependency resolution."
echo " This component has no dependencies. Skipping dependency resolution."
}
installSelf(){
#
# Copy the blocker list into the current directory.
# Ideally, we would do this with a symlink but, unfortunately, the
# Safari Extension Builder does not see symlinks. Leaving the symlink
# code commented out, so we can reuse it easily in the macOS version.
#
# (This means that you currently have to manually copy over the
# copy after each build. TODO: Add feature to Better Builder to
# automate this.)
#
blockerListPath=Better.safariextension/blockerList.json
if ! [ -f $blockerListPath ]; then
echo "\n · Creating symlink to the content blocking rules (blockerList.json)"
ln -s ~/better.fyi/data/site/blockerList.json $blockerListPath;
else
echo "\n · Content blocking rules (blockerList.json) symlink already exists. Skipped creation."
fi
echo "\n · Installation complete.\n\n"
echo "\n • Coping content blocking rules (blockerList.json)"
cp ~/better.fyi/data/site/blockerList.json $blockerListPath
# if ! [ -f $blockerListPath ]; then
# echo "\n • Creating symlink to the content blocking rules (blockerList.json)"
# ln -s ~/better.fyi/data/site/blockerList.json $blockerListPath;
# else
# echo "\n • Content blocking rules (blockerList.json) symlink already exists. Skipped creation."
# fi
echo "\n • Installation complete.\n\n"
}
flagEnd(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment