diff --git a/README.md b/README.md index 0eecaed..494af64 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,9 @@ Xfce repository structure (https://gitlab.xfce.org). ---- ### List of scripts #### Menu scripts -`xfce-repocapp.sh` - provides a rudimentary menu-driven option to run the scripts. +`xfce-repocapp.py` - provides a rudimentary menu-driven option to run the scripts. This is entirely optional. All of these scripts can be run independently. -OR - -`xfce-repocapp.py` - same menu script re-written in Python - ---- #### Individual action scripts diff --git a/TODO.md b/TODO.md index ff84b60..98a18dd 100644 --- a/TODO.md +++ b/TODO.md @@ -1,13 +1,18 @@ >>>>># xfce-repocapp - TODO ### Current TODO list - - merge bugfix for [Bug in menu selection input](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/16) + - Happy New Year! + +---- +### as of 20211231 + - ~~bump to 0.8.4 and release~~ + - ~~merge bugfix for [Bug in menu selection input~~]~~(https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/16)~~ - run, build, test initial wheel files - - [Create a more aesthetically pleasing ASCII banner for menus](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/12) + - [~~Create a more aesthetically pleasing ASCII banner for menus~~]~~(https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/12)~~ - [Allow user specified installation directory](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/13) - [add help and usage options for xfce-repocapp.py](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/15) - [Feature Request: Create a better "press any key option" for xfce-repocapp.sh](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/9) - - [Deprecate xfce-repocapp.sh in favor of xfce-repocapp.py](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/10) - Tentatively planned for 20211231 + - [~~Deprecate xfce-repocapp.sh in favor of xfce-repocapp.py~~]~~(https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/10)~~ - [Add logging to activities](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/11) - [add final successful count of actions when using "all" option on the menus](https://gitlab.com/kevinbowen/xfce-repocapp/-/issues/14) ---- diff --git a/__init__.py b/__init__.py index 767632c..e4d1810 100644 --- a/__init__.py +++ b/__init__.py @@ -1,4 +1,4 @@ __author__ = 'Kevin Bowen ' -__version__ = '0.8.3' +__version__ = '0.8.4' __doc__ = 'add usage information example here' -__releasedate__ = '20211228' +__releasedate__ = '20211231' diff --git a/build_xfce.py b/build_xfce.py index de34cd1..18633f8 100755 --- a/build_xfce.py +++ b/build_xfce.py @@ -5,8 +5,8 @@ Purpose: Build local Xfce repositories source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/cappdata.py b/cappdata.py index 5e31015..1c7fdea 100644 --- a/cappdata.py +++ b/cappdata.py @@ -6,8 +6,8 @@ xfce-repocapp.py and associated scripts source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/clean_xfce.py b/clean_xfce.py index e8b7e07..ef4e082 100755 --- a/clean_xfce.py +++ b/clean_xfce.py @@ -5,8 +5,8 @@ Purpose: Clean local Xfce repository directories source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/clone_xfce.py b/clone_xfce.py index 24ba7e8..7b86b39 100755 --- a/clone_xfce.py +++ b/clone_xfce.py @@ -6,8 +6,8 @@ https://gitlab.xfce.org/ source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/install_xfce.py b/install_xfce.py index bd8a2bb..bc48eaf 100755 --- a/install_xfce.py +++ b/install_xfce.py @@ -5,8 +5,8 @@ Purpose: Install Xfce components into system source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/pull_xfce.py b/pull_xfce.py index 88e3dc5..74b9dac 100755 --- a/pull_xfce.py +++ b/pull_xfce.py @@ -6,8 +6,8 @@ https://gitlab.xfce.org source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/purge_xfce.py b/purge_xfce.py index d4bef95..47647f8 100755 --- a/purge_xfce.py +++ b/purge_xfce.py @@ -6,8 +6,8 @@ https://gitlab.xfce.org source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/pyproject.toml b/pyproject.toml index d6c6ef4..fe438d4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [tool.poetry] name = "xfce_repocapp" -version = "0.8.3" +version = "0.8.4" description = "A collection of scripts to maintain local Xfce repositories" authors = ["Kevin Bowen "] license = "GPL-2.0-only" diff --git a/setup.cfg b/setup.cfg index 55f7866..3b3e505 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = xfce-repocapp -version = 0.8.3 +version = 0.8.4 author = Kevin Bowen author_email = kevin.bowen@gmail.com description = Build scripts for managing Xfce repositories diff --git a/setup.py b/setup.py index f272428..aada6a2 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="xfce-repocapp-KEVIN-BOWEN", - version="0.8.3", + version="0.8.4", author="Kevin Bowen", author_email="kevin.bowen@gmail.com", description="Build scripts for managing Xfce repositories", diff --git a/tests/__init__.py b/tests/__init__.py index 19e0470..6611e4b 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1 +1 @@ -__version__ = "0.8.3" \ No newline at end of file +__version__ = "0.8.4" \ No newline at end of file diff --git a/tests/test_xfce_repocapp.py b/tests/test_xfce_repocapp.py index 1c16d8d..f1788b6 100644 --- a/tests/test_xfce_repocapp.py +++ b/tests/test_xfce_repocapp.py @@ -7,4 +7,4 @@ def test_author(): def test_version(): - assert __version__ == '0.8.3' + assert __version__ == '0.8.4' diff --git a/xfce-repocapp.py b/xfce-repocapp.py index 41a9070..a791e2e 100755 --- a/xfce-repocapp.py +++ b/xfce-repocapp.py @@ -6,8 +6,8 @@ https://gitlab.xfce.org/ source: https://gitlab.com/kevinbowen/xfce-repocapp -version: 0.8.3 -updated: 20211228 +version: 0.8.4 +updated: 20211231 @author: kevin.bowen@gmail.com """ diff --git a/xfce-repocapp.sh b/xfce-repocapp.sh deleted file mode 100755 index 82f61f2..0000000 --- a/xfce-repocapp.sh +++ /dev/null @@ -1,371 +0,0 @@ -#!/bin/bash - -# {{{ ------------------------------------------------------------------ # -# -# Name: xfce-repocapp.sh -# -# Purpose: Provide a basic menu-driven system that will run scripts from -# https://gitlab.com/kevinbowen/xfce-repocapp.git -# These scripts, in turn, manage git repositories pulled from -# https://gitlab.xfce.org -# -# source: https://gitlab.com/kevinbowen/xfce-repocapp -# version: 0.8.3 -# updated: 20211228 -# @author: kevin.bowen@gmail.com -# -# }}} ------------------------------------------------------------------ # -clear - -echo "#####################################################" -echo "# xfce-repocapp: local Xfce repository maintenance #" -echo "#####################################################" -echo - - - -options=("Clone" "Build" "Install" "Clean" "Pull" "Purge" "Quit") -optionsprompt='Please enter your choice: ' - -sub1=("Clone apps" "Clone bindings" "Clone core" "Clone panel-plugins" - "Clone thunar-plugins" "Clone www" "Clone all repos" - "Back to Main Menu" "Quit") -sub1prompt='Please enter your choice: ' - -sub2=("Build apps" "Build bindings" "Build core" "Build panel-plugins" - "Build thunar-plugins" "Build all repos" "Back to Main Menu" "Quit") -sub2prompt='Please enter your choice: ' - -sub3=("Install apps" "Install bindings" "Install core" "Install panel-plugins" - "Install thunar-plugins" "Install all repos" "Back to Main Menu" - "Quit" ) -sub3prompt='Please enter your choice: ' - -sub4=("Clean apps" "Clean bindings" "Clean core" "Clean panel-plugins" - "Clean thunar-plugins" "Clean all repos" "Back to Main Menu" "Quit" ) -sub4prompt='Please enter your choice: ' - -sub5=("Pull apps" "Pull bindings" "Pull core" "Pull panel-plugins" - "Pull thunar-plugins" "Pull www" "Pull all repos" "Back to Main Menu" - "Quit" ) -sub5prompt='Please enter your choice: ' - -sub6=("Purge apps" "Purge bindings" "Purge core" "Purge panel-plugins" - "Purge thunar-plugins" "Purge www" "Purge all repos" - "Back to Main Menu" "Quit" ) -sub6prompt='Please enter your choice: ' - -PS3=$optionsprompt -select opt in "${options[@]}" -do - case $opt in - "Clone") - PS3=$sub1prompt - select sub1opt in "${sub1[@]}" - do - case $sub1opt in - "Clone apps") - clone_xfce.py -c apps - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clone bindings") - clone_xfce.py -c bindings - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clone core") - clone_xfce.py -c xfce - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clone panel-plugins") - clone_xfce.py -c panel-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clone thunar-plugins") - clone_xfce.py -c thunar-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clone www") - clone_xfce.py -c www - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clone all repos") - printf "Cloning all Xfce repositories...\n" - clone_xfce.py -c all - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Back to Main Menu") - printf "Returning to Main Menu..." - exec "$0" - ;; - "Quit") - printf "Goodbye..." - exit - ;; - *) echo invalid option;; - esac - done - ;; - "Build") - PS3=$sub2prompt - select sub2opt in "${sub2[@]}" - do - case $sub2opt in - "Build apps") - build_xfce.py -c apps - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Build bindings") - build_xfce.py -c bindings - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Build core") - build_xfce.py -c xfce - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Build panel-plugins") - build_xfce.py -c panel-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Build thunar-plugins") - build_xfce.py -c thunar-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Build all repos") - printf "Building all Xfce repositories...\n" - build_xfce.py -c all - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Back to Main Menu") - printf "Returning to Main Menu..." - exec "$0" - ;; - "Quit") - printf "Goodbye..." - exit - ;; - *) echo invalid option;; - esac - done - ;; - "Install") - PS3=$sub3prompt - select sub3opt in "${sub3[@]}" - do - case $sub3opt in - "Install apps") - install_xfce.py -c apps - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Install bindings") - install_xfce.py -c bindings - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Install core") - install_xfce.py -c xfce - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Install panel-plugins") - install_xfce.py -c panel-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Install thunar-plugins") - install_xfce.py -c thunar-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Install all repos") - printf "Installing all Xfce repositories...\n" - install_xfce.py -c all - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Back to Main Menu") - printf "Returning to Main Menu..." - exec "$0" - ;; - "Quit") - printf "Goodbye..." - exit - ;; - *) echo invalid option;; - esac - done - ;; - "Clean") - PS3=$sub4prompt - select sub4opt in "${sub4[@]}" - do - case $sub4opt in - "Clean apps") - clean_xfce.py -c apps - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clean bindings") - clean_xfce.py -c bindings - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clean core") - clean_xfce.py -c xfce - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clean panel-plugins") - clean_xfce.py -c panel-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clean thunar-plugins") - clean_xfce.py -c thunar-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Clean all repos") - printf "Cleaning all Xfce repositories...\n" - clean_xfce.py -c all - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Back to Main Menu") - printf "Returning to Main Menu..." - exec "$0" - ;; - "Quit") - printf "Goodbye..." - exit - ;; - *) echo invalid option;; - esac - done - ;; - "Pull") - PS3=$sub5prompt - select sub5opt in "${sub5[@]}" - do - case $sub5opt in - "Pull apps") - pull_xfce.py -c apps - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Pull bindings") - pull_xfce.py -c bindings - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Pull core") - pull_xfce.py -c xfce - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Pull panel-plugins") - pull_xfce.py -c panel-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Pull thunar-plugins") - pull_xfce.py -c thunar-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Pull www") - pull_xfce.py -c www - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Pull all repos") - printf "Pulling all Xfce repositories...\n" - pull_xfce.py -c all - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Back to Main Menu") - printf "Returning to Main Menu..." - exec "$0" - ;; - "Quit") - printf "Goodbye..." - exit - ;; - *) echo invalid option;; - esac - done - ;; - "Purge") - PS3=$sub6prompt - select sub6opt in "${sub6[@]}" - do - case $sub6opt in - "Purge apps") - purge_xfce.py -c apps - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Purge bindings") - purge_xfce.py -c bindings - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Purge core") - purge_xfce.py -c xfce - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Purge panel-plugins") - purge_xfce.py -c panel-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Purge thunar-plugins") - purge_xfce.py -c thunar-plugins - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Purge www") - purge_xfce.py -c www - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Purge all repos") - printf "Purging all Xfce repositories...\n" - purge_xfce.py -c all - read -p "Press any key to continue... " -r -n1 -s - exec "$0" - ;; - "Back to Main Menu") - printf "Returning to Main Menu..." - exec "$0" - ;; - "Quit") - printf "Goodbye..." - exit - ;; - *) echo invalid option;; - esac - done - ;; - "Quit") - break - ;; - *) echo invalid option;; - esac -done -# done