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.

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

Fixing the error of unable locate the init Profile #55

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 16 additions & 1 deletion linux/build/build
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,28 @@ echo "Downloading NoScript extension..."
curl -L -f -# -o ../browser/browser/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi https://addons.mozilla.org/firefox/downloads/file/4002416/noscript-11.4.11.xpi

echo "Adding standard configs..."
mkdir -p ../browser/.mozilla/firefox/
echo -ne -n -e "[Profile2]\nName=profile-ru\nIsRelative=1\nPath=profile-ru\n[Profile1]\nName=profile-en\nIsRelative=1\nPath=profile-en\n[Profile0]\nName=profile\nIsRelative=1\nPath=profile\n[General]\nStartWithLastProfile=1\nVersion=2\nName=Profile-ru\nIsRelative=1\nPath=profile-ru" > ../browser/.mozilla/firefox/profiles.ini
cp -r preferences/* ../browser/
cp -r profile/* ../browser/data/
cp -r profile ../browser/.mozilla/firefox/
cp -r profile-ru/ ../browser/.mozilla/firefox/
cp -r profile-en/ ../browser/.mozilla/firefox/

if [ "$language" = "ru" ]; then
mkdir -p ../browser/.mozilla/firefox/
cp -r profile-ru/* ../browser/data/
cp -r profile ../browser/.mozilla/firefox/
cp -r profile-en/ ../browser/.mozilla/firefox/
cp -r profile-ru/ ../browser/.mozilla/firefox/
echo -ne -n -e "[Profile2]\nName=profile-ru\nIsRelative=1\nPath=profile-ru\n[Profile1]\nName=profile-en\nIsRelative=1\nPath=profile-en\n[Profile0]\nName=profile\nIsRelative=1\nPath=profile\n[General]\nStartWithLastProfile=1\nVersion=2\nName=Profile-ru\nIsRelative=1\nPath=profile-ru" > ../browser/.mozilla/firefox/profiles.ini
else
cp -r profile-en/* ../browser/data/
mkdir ../browser/.mozilla/
cp -r profile-en/ ../browser/data/
cp -r profile ../browser/.mozilla/firefox/
cp -r profile-ru/ ../browser/.mozilla/firefox/
cp -r profile-en/ ../browser/.mozilla/firefox/
echo -ne -n -e "[Profile2]\nName=profile-ru\nIsRelative=1\nPath=profile-ru\n[Profile1]\nName=profile-en\nIsRelative=1\nPath=profile-en\n[Profile0]\nName=profile\nIsRelative=1\nPath=profile\n[General]\nStartWithLastProfile=1\nVersion=2\nName=Profile-ru\nIsRelative=1\nPath=profile-ru" > ../browser/.mozilla/firefox/profiles.ini
fi

echo "Copying Desktop launch scripts..."
Expand Down
8 changes: 4 additions & 4 deletions linux/build/scripts/start-i2pd-browser
Original file line number Diff line number Diff line change
Expand Up @@ -272,18 +272,18 @@ if [ "$show_usage" -eq 1 ]; then
tbb_usage
elif [ "$detach" -eq 1 ] ; then
./firefox --class "I2Pd Browser" \
-profile data "${@}" > "$logfile" 2>&1 </dev/null &
-ProfileManager "${@}" > "$logfile" 2>&1 </dev/null &
disown "$!"
elif [ "$log_output" -eq 1 -a "$show_output" -eq 1 ]; then
./firefox --class "I2Pd Browser" \
-profile data "${@}" 2>&1 </dev/null | \
-ProfileManager "${@}" 2>&1 </dev/null | \
tee "$logfile"
elif [ "$show_output" -eq 1 ]; then
./firefox --class "I2Pd Browser" \
-profile data "${@}" < /dev/null
-ProfileManager "${@}" < /dev/null
else
./firefox --class "I2Pd Browser" \
-profile data "${@}" > "$logfile" 2>&1 </dev/null
-ProfileManager "${@}" > "$logfile" 2>&1 </dev/null
fi

exit $?
Loading