Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dopsi committed Dec 13, 2017
2 parents 00a55cc + 4cc9e69 commit 334ce24
Show file tree
Hide file tree
Showing 8 changed files with 420 additions and 409 deletions.
117 changes: 61 additions & 56 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,78 +1,83 @@
# Change Log
# ChangeLog

All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [2017-12-13] 1.3.0: Version 1.3.0

## [v1.2.4] 2017-10-06
* Create the --disable-xrunning-check
* Add XDG_VTNR support
* Use spaces instead of tabs
* Rewrite the changelog using an automated tool
* Make the tdm script XDG compliant
* Make tdmctl XDG compliant
* Add XDG compliance informations to manpage
* Fix shellcheck coding style issues
* Update help message in tdmctl
* Check if a configuration exists before migrating
* Update README.md documentation
* Update shields
* Improve README style and content

### Changed
## [2017-10-11] v1.2.4: Version bump: 1.2.3 -> 1.2.4

* tdm: Bugfix preventing tdm from relaunching after starting X
* Fix tdm relaunch after killing X. (#16)

## [v1.2.3] 2017-10-05
## [2017-10-05] v1.2.3: Fix relaunching of tdm

### Changed
* Fix relaunching of tdm

* tdm: fix bug preventing the relaunch of tdm
## [2017-08-06] v1.2.2: Version bump 1.2.1 -> 1.2.2

## [v1.2.2] 2017-08-06
* Add badges
* Add screenshots
* Add symlink for xmonad (#12)
* Various cleanup steps (#13)
* Fix the missing 'extra' directory when creating a new configuration
* Fix quotes and useless commands

### Changed
## [2017-03-28] v1.2.1: Version and documentation update

* tdmctl: create the `extra` directory if missing on new configuration
* tdmctl: new information message in case of error during the `init`
* tdmctl: fix shellcheck issues
* various files: fix issues with whitespace and wording (by DuncanvR)
* Add contributors
* Revert "Log the user out"
* Return non-zero and no logout
* Version and documentation update

## [v1.2.1] 2017-03-28
## [2017-03-25] v1.2.0: Add more explicit message

### Changed
* Hardened X server detection (#5)
* Keep track of changes
* Log the user out
* Do not fail if no default
* Documentation updates suggested by @hartwork
* Also check for extra sessions
* Add more explicit message

* tdm: revert the user getting logged out
* tdm: return non-zero if no session was executed
## [2017-02-24] v1.1.2: Add documentation

## [v1.2.0] 2017-03-25
* Makefile: Support DESTDIR
* Add documentation

### Changed
## [2016-08-04] v1.1.1: Fix PREFIX usage in tdmctl and Makefile. Closes #1

* tdm: change X process detection method
* tdmctl: check extra sessions
* tdmctl: more explicit error messages if the command is not found
* tdmctl: handle no default installations
* tdm: actually log the user out
* Fix typos and url
* Fix PREFIX usage in tdmctl and Makefile. Closes #1

## [v1.1.2] 2017-02-24
## [2016-02-17] v1.1.0: Version bump (1.1.0)

### Changed
* Fix directories installation
* Add verification feature to tdmctl
* Fix errors if already existing symlinks
* Fix cache functionnality
* Add manpage
* Also list extra sessions
* Fix manpage
* Add remove command
* Add remove functionnality to manpage
* Add license and license headers
* Update README.md

* Makefile: use DESTDIR (thanks @hartwork)
* README.md: add installation and usage
## [2015-12-31] v1.0.0: Change version

## [v1.1.1] 2016-08-04
* Change version

### Changed
## [2015-12-30] v0.4.0: Update README with original source

* tdmctl: set PREFIX to /usr/local (to be consistent with Makefile)
* Makefile (bin): set the prefix in tdmctl to the same value as in Makefile

## [v1.1.0] 2016-02-17

### New features

* tdmctl (verify): add verification function to check for directory structure integrity
* tdmctl: add the remove command and update the usage message
* Makefile (doc): add new target to install documentation
* tdm.1: add manpage

### Changed

* Makefile (scripts): add the extra directory to the default configuration
* tdmctl (main script): add verification
(cache functionality): put extra session in correct directory and check for links
* links.sh (main script): force symlink replacement if already existing

## [v1.0.0] 2015-12-31

### Changed

* tdm (version number): changed to 1.0.0
* Update README with original source
58 changes: 0 additions & 58 deletions NEWS.md

This file was deleted.

21 changes: 13 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# tdm

[![AUR](https://img.shields.io/aur/version/console-tdm.svg)](https://aur.archlinux.org/packages/console-tdm)
[![GitHub release](https://img.shields.io/github/release/dopsi/console-tdm.svg)](https://github.com/dopsi/console-tdm/releases/latest)
[![GitHub release](https://img.shields.io/github/tag/dopsi/console-tdm.svg)](https://github.com/dopsi/console-tdm/releases/latest)

The TDM display manager is a wrapper script for `startx`.

Expand Down Expand Up @@ -105,10 +105,13 @@ Remove session

Enable or disable session

tdmctl enable/disable <session>: enable/disable session
tdmctl enable/disable <session>

Versioning
-----------
Migrate configuration to XDG compliant directory

tdmctl migrate

## Versioning

This project follows the semantic versioning guidelines provided at
[semver.org](http://semver.org/) with versions numbered as `MAJOR.MINOR.
Expand All @@ -123,8 +126,11 @@ should its API.

Versions history can be found in the file ChangeLog.md

License
-------
## Repository structure

This repository uses [git flow](https://github.com/nvie/gitflow).

## License

> This file is part of tdm.
>
Expand All @@ -141,8 +147,7 @@ License
> You should have received a copy of the GNU General Public License
> along with tdm. If not, see <http://www.gnu.org/licenses/>.
Authors
=======
## Authors

Currently maintained by dopsi.

Expand Down
44 changes: 22 additions & 22 deletions _tdmctl
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,30 @@
# along with tdm. If not, see <http://www.gnu.org/licenses/>.

_tdmctl(){
local curcontext="$curcontext" state line
typeset -A opt_args
local curcontext="$curcontext" state line
typeset -A opt_args

_arguments \
'1: :->actions'\
'*: :->options'
_arguments \
'1: :->actions'\
'*: :->options'

case $state in
actions)
_arguments "1:Actions:(init list cache check default add enable disable)"
;;
*)
case $words[2] in
check|default|disable)
compadd "$@" $(tdmctl list)
;;
enable)
compadd "$@" $(tdmctl cache)
;;
*)
;;
esac
;;
esac
case $state in
actions)
_arguments "1:Actions:(init list cache check default add enable disable)"
;;
*)
case $words[2] in
check|default|disable)
compadd "$@" $(tdmctl list)
;;
enable)
compadd "$@" $(tdmctl cache)
;;
*)
;;
esac
;;
esac
}

_tdmctl "$@"
Loading

0 comments on commit 334ce24

Please sign in to comment.