Making windows uninstallation messages similar to linux and updating docs

s-n-g · s-n-g · commit 4255f5a0c0df · 2020-09-30T15:58:36.000+03:00
diff --git a/build.html b/build.html
@@ -28,8 +28,8 @@
 <body>
 <header id="title-block-header">
 </header>
-<h1 id="building-pyradio-from-source">Building PyRadio from source</h1>
-<p>Command line internet radio player.</p>
+<h1 id="pyradio-build-instructions">PyRadio Build Instructions</h1>
+<p><strong>PyRadio</strong>: Command line internet radio player.</p>
 <p>Ben Dowling - <a target="_blank" href="https://github.com/coderholic">https://github.com/coderholic</a></p>
 <h2 id="table-of-contents">Table of contents <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <ul>
diff --git a/build.md b/build.md
@@ -1,6 +1,6 @@
-# Building PyRadio from source
+# PyRadio Build Instructions
 
-Command line internet radio player.
+**PyRadio**: Command line internet radio player.
 
 Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 
diff --git a/devel/build_install_pyradio.bat b/devel/build_install_pyradio.bat
@@ -147,11 +147,11 @@ goto :endofscript
 echo Uninstalling PyRadio
 echo ** Gathering information...
 DEL pyremove.bat 2>nul
-echo echo ** Removing executable... >>pyremove.bat
-echo echo ** Removing Desktop shortcut... >>pyremove.bat
+echo echo ** Removing executable ... done>>pyremove.bat
+echo echo ** Removing Desktop shortcut ... done >>pyremove.bat
 echo IF EXIST "%DESKTOP%\PyRadio.lnk" DEL "%DESKTOP%\PyRadio.lnk" 2>nul >>pyremove.bat
 python devel\site.py exe 2>nul >>pyremove.bat
-REM echo echo ** Removing Python files... >>pyremove.bat
+REM echo echo ** Removing Python files ... done >>pyremove.bat
 python devel\site.py 2>nul >dirs
 python2 devel\site.py 2>nul >>dirs
 python3 devel\site.py 2>nul >>dirs
diff --git a/devel/pre-commit b/devel/pre-commit
@@ -11,7 +11,7 @@ do
     elif [ "$afile" = "build.md" ];then
         echo '% PyRadio Build Instructions' > tmp.md
     elif [ "$afile" = "windows.md" ];then
-        echo '% Running PyRadio on Windows' > tmp.md
+        echo '% PyRadio on Windows' > tmp.md
     fi
     cat ${afile} >> tmp.md
     pandoc -s -t html tmp.md -o ${out} || {
diff --git a/devel/windirs.py b/devel/windirs.py
@@ -35,5 +35,5 @@ def show_python_dirs():
                 with open("pyremove.bat", "a") as f:
                     f.write('echo Looking for python installed files...\n')
                     for a_dir in pydirs:
-                        f.write('echo ** "{}"\n'.format(basename(a_dir)))
+                        f.write('echo ** Removing "{}" ... done \n'.format(basename(a_dir)))
                         f.write('RD /S /Q "{}"\n'.format(a_dir))
diff --git a/windows.html b/windows.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-  <title>Running PyRadio on Windows</title>
+  <title>PyRadio on Windows</title>
   <style>
     html {margin: 2em;} 
     h2 {margin-top: 2.5em; border-bottom:1px solid #D6D6D6;} 
@@ -28,8 +28,8 @@
 <body>
 <header id="title-block-header">
 </header>
-<h1 id="pyradio">PyRadio</h1>
-<p>Command line internet radio player.</p>
+<h1 id="pyradio-on-windows">PyRadio on Windows</h1>
+<p><strong>PyRadio</strong>: Command line internet radio player.</p>
 <p>Ben Dowling - <a target="_blank" href="https://github.com/coderholic">https://github.com/coderholic</a></p>
 <h2 id="table-of-contents">Table of contents <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <ul>
@@ -203,20 +203,20 @@ <h4 id="updating-without-git">5.2 Updating without Git</h4>
 <p>The procedure is the same as installing, so please follow the <a href="#not-using-git">relevant instructions</a>.</p>
 <h3 id="uninstalling-pyradio-or-cleaning-up">6. Uninstalling Pyradio (or Cleaning up) <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h3>
 <p>To uninstall <strong>PyRadio</strong> you will have to use the “<strong>-u</strong>” (uninstall) parameter.</p>
-<p>This procedure will remove any <strong>Pyradio</strong> files installed in your system, but will leave instact <strong>PyRadio</strong> configuration files or uninstall python, mplayer, or git from your system.</p>
+<p>This procedure will remove any <strong>Pyradio</strong> files installed in your system, but will leave instact <strong>PyRadio</strong> configuration files and python, mplayer and git (if installed).</p>
 <p>To uninstall <strong>PyRadio</strong> open a console (press the <strong>Win</strong> key, type <strong>cmd</strong> and press <strong>ENTER</strong> or if you are on Windows 10, use <strong>Run it as Administrator</strong> as you can see in the following image).</p>
 <p><a target="_blank" href="https://members.hellug.gr/sng/pyradio/run-as-admin.jpg">Run as Administrator</a></p>
 <p>Then navigate to the previously downloaded <strong>Pyradio</strong> setup folder, and execute <em>devel\build_install_pyradio -u</em>.</p>
 <p>Example:</p>
 <pre>C:\Users\spiros\pyradio&gt;devel\build_install_pyradio -u
 Uninstalling PyRadio
 ** Gathering information...
-** Removing executable...
-** Removing Desktop shortcut...
+** Removing executable ... done
+** Removing Desktop shortcut ... done
 Looking for python installed files...
-** &quot;pyradio-0.8.8-py3.7.egg&quot;
-** &quot;pyradio-0.7.9-py3.7.egg&quot;
-** &quot;pyradio-0.6.3-py3.7.egg&quot;
+** Removing &quot;pyradio-0.8.8-py3.7.egg&quot; ... done
+** Removing &quot;pyradio-0.7.9-py3.7.egg&quot; ... done
+** Removing &quot;pyradio-0.6.3-py3.7.egg&quot; ... done
 Pyradio successfully uninstalled!
 
 *********************************************************
@@ -229,7 +229,7 @@ <h3 id="uninstalling-pyradio-or-cleaning-up">6. Uninstalling Pyradio (or Cleanin
 
 **********************************************************</pre>
 <p>In this example, running <em>devel\build_install_pyradio -u</em> has removed <strong>PyRadio</strong> python 3.7 installation files.</p>
-<p>The script has detected (and removed) version <em>8.8</em> (probably the current or previous version), along with verisons <em>7.9</em> and <em>6.3</em> (older versions previously installed).</p>
+<p>The script has detected (and removed) version <em>0.8.8</em> (probably the current or previous version), along with verisons <em>0.7.9</em> and <em>0.6.3</em> (older versions previously installed).</p>
 <p>I would recommend to execute <em>devel\build_install_pyradio -u</em> from time to time, and reinstall <strong>PyRadio</strong> right after its completion.</p>
 </body>
 </html>
diff --git a/windows.md b/windows.md
@@ -1,6 +1,6 @@
-# PyRadio
+# PyRadio on Windows
 
-Command line internet radio player.
+**PyRadio**: Command line internet radio player.
 
 Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 
@@ -288,7 +288,7 @@ The procedure is the same as installing, so please follow the [relevant instruct
 
 To uninstall **PyRadio** you will have to use the "**-u**" (uninstall) parameter.
 
-This procedure will remove any **Pyradio** files installed in your system, but will leave instact **PyRadio** configuration files or uninstall python, mplayer, or git from your system.
+This procedure will remove any **Pyradio** files installed in your system, but will leave instact **PyRadio** configuration files and python, mplayer and git (if installed).
 
 To uninstall **PyRadio** open a console (press the **Win** key, type **cmd** and press **ENTER** or if you are on Windows 10, use **Run it as Administrator** as you can see in the following image).
 
@@ -301,12 +301,12 @@ Example:
     C:\Users\spiros\pyradio>devel\build_install_pyradio -u
     Uninstalling PyRadio
     ** Gathering information...
-    ** Removing executable...
-    ** Removing Desktop shortcut...
+    ** Removing executable ... done
+    ** Removing Desktop shortcut ... done
     Looking for python installed files...
-	** "pyradio-0.8.8-py3.7.egg"
-	** "pyradio-0.7.9-py3.7.egg"
-	** "pyradio-0.6.3-py3.7.egg"
+	** Removing "pyradio-0.8.8-py3.7.egg" ... done
+	** Removing "pyradio-0.7.9-py3.7.egg" ... done
+	** Removing "pyradio-0.6.3-py3.7.egg" ... done
     Pyradio successfully uninstalled!
 
     *********************************************************
@@ -321,6 +321,6 @@ Example:
 
 In this example, running *devel\\build_install_pyradio -u* has removed **PyRadio** python 3.7 installation files.
 
-The script has detected (and removed) version *8.8* (probably the current or previous version), along with verisons *7.9* and *6.3* (older versions previously installed).
+The script has detected (and removed) version *0.8.8* (probably the current or previous version), along with verisons *0.7.9* and *0.6.3* (older versions previously installed).
 
 I would recommend to execute *devel\\build_install_pyradio -u* from time to time, and reinstall **PyRadio** right after its completion.
