diff --git a/default.nix b/default.nix index 6e7da1f..d6e6889 100644 --- a/default.nix +++ b/default.nix @@ -117,17 +117,17 @@ rec { ''} > /dev/null fi - echo "Uninstall home-manager-path..." + echo "Uninstalling home-manager-path..." ${pkgs.nix}/bin/nix-env --uninstall home-manager-path 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 - echo "Install first nix-on-droid generation..." + echo "Installing first nix-on-droid generation..." ${nix-on-droid}/bin/nix-on-droid switch - echo "Uninstall basic-environment..." + echo "Uninstalling 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." diff --git a/modules/environment/login/login-inner.nix b/modules/environment/login/login-inner.nix index dbe1317..669258d 100644 --- a/modules/environment/login/login-inner.nix +++ b/modules/environment/login/login-inner.nix @@ -18,8 +18,7 @@ writeText "login-inner" '' [ "$#" -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 it does not help, report bugs at https://github.com/t184256/nix-on-droid-bootstrap/issues" + [ "$#" -gt 0 ] || echo "If nothing works, open an issue at https://github.com/t184256/nix-on-droid-bootstrap/issues or try the rescue shell." set +u . "${sessionInitPackage}/etc/profile.d/nix-on-droid-session-init.sh" @@ -27,7 +26,7 @@ writeText "login-inner" '' ${lib.optionalString config.build.initialBuild '' 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 [ "$#" -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 --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/cp $(${nix}/bin/nix-instantiate --eval --expr "") $HOME/.config/nixpkgs/nix-on-droid.nix ${coreutils}/bin/chmod u+w $HOME/.config/nixpkgs/nix-on-droid.nix diff --git a/modules/environment/login/login.nix b/modules/environment/login/login.nix index b69f7e9..f9a3735 100644 --- a/modules/environment/login/login.nix +++ b/modules/environment/login/login.nix @@ -17,12 +17,12 @@ writeScript "login" '' if ! /system/bin/pgrep proot-static > /dev/null; 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 fi 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 fi fi diff --git a/nix-on-droid/nix-on-droid.sh b/nix-on-droid/nix-on-droid.sh index 2c5461c..5882fd2 100644 --- a/nix-on-droid/nix-on-droid.sh +++ b/nix-on-droid/nix-on-droid.sh @@ -66,7 +66,7 @@ function doSwitch() { ${PASSTHROUGH_OPTS[*]} \ activationPackage - echo "Run activation script..." + echo "Executing activation script..." generationDir="$(nix path-info \ --file "" \ ${PASSTHROUGH_OPTS[*]} \ @@ -80,7 +80,7 @@ function doSwitchGeneration() { local generationNum=$1 if [[ -x "${PROFILE_DIRECTORY}-${generationNum}-link/activate" ]]; then - echo "Run activation script..." + echo "Executing activation script..." "${PROFILE_DIRECTORY}-${generationNum}-link/activate" else errorEcho "Activation was not successful, generation is either broken or already garbage collected."