nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 19:46:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak user-facing messages

Browse source
This commit is contained in:
Alexander Sosedkin 2020-01-09 22:49:23 +01:00
parent eb2f3bca34
commit bbb0e8ffbf
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
default.nix
View file

@ -117,17 +117,17 @@ rec {
''} > /dev/null ''} > /dev/null
fi fi
echo "Uninstall home-manager-path..." echo "Uninstalling home-manager-path..."
${pkgs.nix}/bin/nix-env --uninstall home-manager-path ${pkgs.nix}/bin/nix-env --uninstall home-manager-path
fi fi
echo "Decrease priority of basic-environment..." echo "Decreasing priority of basic-environment..."
${pkgs.nix}/bin/nix-env --set-flag priority 120 basic-environment || true ${pkgs.nix}/bin/nix-env --set-flag priority 120 basic-environment || true
echo "Install first nix-on-droid generation..." echo "Installing first nix-on-droid generation..."
${nix-on-droid}/bin/nix-on-droid switch ${nix-on-droid}/bin/nix-on-droid switch
echo "Uninstall basic-environment..." echo "Uninstalling basic-environment..."
${pkgs.nix}/bin/nix-env --uninstall basic-environment ${pkgs.nix}/bin/nix-env --uninstall basic-environment
echo "Installation successful! Please restart the app to complete the migration as starting new sessions will fail." echo "Installation successful! Please restart the app to complete the migration as starting new sessions will fail."

7
modules/environment/login/login-inner.nix
View file

@ -18,8 +18,7 @@ writeText "login-inner" ''
[ "$#" -gt 0 ] || echo "Welcome to Nix-on-Droid!" [ "$#" -gt 0 ] || echo "Welcome to Nix-on-Droid!"
[ "$#" -gt 0 ] || echo "If nothing works, use the rescue shell and read ${config.build.installationDir}/usr/lib/login-inner" [ "$#" -gt 0 ] || echo "If nothing works, open an issue at https://github.com/t184256/nix-on-droid-bootstrap/issues or try the rescue shell."
[ "$#" -gt 0 ] || echo "If it does not help, report bugs at https://github.com/t184256/nix-on-droid-bootstrap/issues"
set +u set +u
. "${sessionInitPackage}/etc/profile.d/nix-on-droid-session-init.sh" . "${sessionInitPackage}/etc/profile.d/nix-on-droid-session-init.sh"
@ -27,7 +26,7 @@ writeText "login-inner" ''
${lib.optionalString config.build.initialBuild '' ${lib.optionalString config.build.initialBuild ''
if [ -e /etc/UNINTIALISED ]; then if [ -e /etc/UNINTIALISED ]; then
echo "Set default user profile..." echo "Setting default user profile..."
${nix}/bin/nix-env --switch-profile /nix/var/nix/profiles/per-user/$USER/profile ${nix}/bin/nix-env --switch-profile /nix/var/nix/profiles/per-user/$USER/profile
[ "$#" -gt 0 ] || echo "Sourcing Nix environment..." [ "$#" -gt 0 ] || echo "Sourcing Nix environment..."
@ -41,7 +40,7 @@ writeText "login-inner" ''
${nix}/bin/nix-channel --add ${config.build.channel.nix-on-droid} nix-on-droid ${nix}/bin/nix-channel --add ${config.build.channel.nix-on-droid} nix-on-droid
${nix}/bin/nix-channel --update nix-on-droid ${nix}/bin/nix-channel --update nix-on-droid
echo "Copy default nix-on-droid config..." echo "Copying default nix-on-droid config..."
${coreutils}/bin/mkdir --parents $HOME/.config/nixpkgs ${coreutils}/bin/mkdir --parents $HOME/.config/nixpkgs
${coreutils}/bin/cp $(${nix}/bin/nix-instantiate --eval --expr "<nix-on-droid/modules/environment/login/nix-on-droid.nix.default>") $HOME/.config/nixpkgs/nix-on-droid.nix ${coreutils}/bin/cp $(${nix}/bin/nix-instantiate --eval --expr "<nix-on-droid/modules/environment/login/nix-on-droid.nix.default>") $HOME/.config/nixpkgs/nix-on-droid.nix
${coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix ${coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix

4
modules/environment/login/login.nix
View file

@ -17,12 +17,12 @@ writeScript "login" ''
if ! /system/bin/pgrep proot-static > /dev/null; then if ! /system/bin/pgrep proot-static > /dev/null; then
if test -e ${installationDir}/bin/.proot-static.new; then if test -e ${installationDir}/bin/.proot-static.new; then
echo "Install new proot-static..." echo "Installing new proot-static..."
/system/bin/mv ${installationDir}/bin/.proot-static.new ${installationDir}/bin/proot-static /system/bin/mv ${installationDir}/bin/.proot-static.new ${installationDir}/bin/proot-static
fi fi
if test -e ${installationDir}/usr/lib/.login-inner.new; then if test -e ${installationDir}/usr/lib/.login-inner.new; then
echo "Install new login-inner..." echo "Installing new login-inner..."
/system/bin/mv ${installationDir}/usr/lib/.login-inner.new ${installationDir}/usr/lib/login-inner /system/bin/mv ${installationDir}/usr/lib/.login-inner.new ${installationDir}/usr/lib/login-inner
fi fi
fi fi

4
nix-on-droid/nix-on-droid.sh
View file

@ -66,7 +66,7 @@ function doSwitch() {
${PASSTHROUGH_OPTS[*]} \ ${PASSTHROUGH_OPTS[*]} \
activationPackage activationPackage
echo "Run activation script..." echo "Executing activation script..."
generationDir="$(nix path-info \ generationDir="$(nix path-info \
--file "<nix-on-droid/modules>" \ --file "<nix-on-droid/modules>" \
${PASSTHROUGH_OPTS[*]} \ ${PASSTHROUGH_OPTS[*]} \
@ -80,7 +80,7 @@ function doSwitchGeneration() {
local generationNum=$1 local generationNum=$1
if [[ -x "${PROFILE_DIRECTORY}-${generationNum}-link/activate" ]]; then if [[ -x "${PROFILE_DIRECTORY}-${generationNum}-link/activate" ]]; then
echo "Run activation script..." echo "Executing activation script..."
"${PROFILE_DIRECTORY}-${generationNum}-link/activate" "${PROFILE_DIRECTORY}-${generationNum}-link/activate"
else else
errorEcho "Activation was not successful, generation is either broken or already garbage collected." errorEcho "Activation was not successful, generation is either broken or already garbage collected."