summarylogtreecommitdiffstats
path: root/marionnet.install
diff options
context:
space:
mode:
authorJulioJu2016-05-26 16:26:03 +0200
committerJulioJu2016-05-26 16:26:03 +0200
commitf29042a86509d5f5d4ae62122026cb61b6c26f85 (patch)
treee74cac77d3a57da79061b16ce350887d488fbc43 /marionnet.install
parent9ef5654180029cd046f7aeafae82dffbe2546037 (diff)
downloadaur-f29042a86509d5f5d4ae62122026cb61b6c26f85.tar.gz
bug fix in marionnet.install
Diffstat (limited to 'marionnet.install')
-rw-r--r--marionnet.install37
1 files changed, 23 insertions, 14 deletions
diff --git a/marionnet.install b/marionnet.install
index dce302d3789..bf8838bc7b5 100644
--- a/marionnet.install
+++ b/marionnet.install
@@ -3,21 +3,23 @@
# http://bazaar.launchpad.net/~marionnet-drivers/marionnet/trunk/view/head:/useful-scripts/marionnet_from_scratch
# (LGPL)
-pre_install() {
- # =============================================================
- # Install marionnet_kernels and filesystems
- # =============================================================
- echo ">>> Warning! Download marionnet kernels and filesystems (Linux
- distributions Debian Lenny, Mandriva, Pinocchio, etc.)"
- echo -e ">>> Warning! this operation can take many and many hours! \n\n\n"
- wget http://www.marionnet.org/downloads/marionnet_from_scratch/marionnet_from_scratch
- echo -e "\n\n\n>>>\`./marionnet_from_scratch --download-only -m trunk\`"
- chmod +x ./marionnet_from_scratch
- ./marionnet_from_scratch --download-only -m trunk
+post_install () {
-}
+# =============================================================
+# Install marionnet_kernels and filesystems
+# =============================================================
+echo "* Marionnet installation completed\n\n\n"
-post_install () {
+echo -e "Post installation hook\n"
+echo -e "——————————————————————\n"
+echo "* Downloading script marionnet_from_scratch : "
+wget http://www.marionnet.org/downloads/marionnet_from_scratch/marionnet_from_scratch
+echo "* Downlading and installing Marionnet kernels and filesystems (Linux
+distributions Debian Lenny, Mandriva, Pinocchio, etc.)"
+echo -e "Warning! this process may take several hours! \n\n"
+echo -e "* Command : \`./marionnet_from_scratch --download-only -m trunk\`"
+chmod +x ./marionnet_from_scratch
+./marionnet_from_scratch --download-only -m trunk
# Here $SUDO_OR_NOTHING is null
@@ -145,7 +147,7 @@ fi
}
if ps -A -o cmd | grep -q '^[a-zA-Z0-9/]*X.*[-]nolisten tcp'; then
- echo '---'
+ echo -e "\n---"
echo "* Warning: your X server has been launched with the option '-nolisten tcp'"
echo " => This option should be removed from your X display manager configuration."
echo -n " Shall I try to fix it ([y]/n)? "
@@ -174,8 +176,15 @@ if ps -A -o cmd | grep -q '^[a-zA-Z0-9/]*X.*[-]nolisten tcp'; then
echo " Sorry, no change performed: you must edit your configuration manually."
fi
fi
+else
+ echo -e "\n\n\n* Your X server hasn't been launched with the option \
+ '-nolisten tcp' : good."
fi
+#### Daemon information
+echo -e "\n\n* Before start Marionnet, you must start the daemon : \n"
+echo "sudo systemctl start marionnetdaemon.service"
+
}