diff --git a/CMakeLists.txt b/CMakeLists.txt index d02f83956..bfc632885 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,7 @@ message ("-- Looking for GNU Readline") find_package (Readline) if (READLINE_FOUND) message ("-- Found GNU Readline: ${READLINE_LIBRARIES}") - set (HAVE_LIBREADLINE true) + set (HAVE_READLINE true) set (TASK_INCLUDE_DIRS ${TASK_INCLUDE_DIRS} ${READLINE_INCLUDE_DIR}) set (TASK_LIBRARIES ${TASK_LIBRARIES} ${READLINE_LIBRARIES}) endif (READLINE_FOUND) @@ -121,7 +121,12 @@ configure_file ( add_subdirectory (src) add_subdirectory (src/commands) add_subdirectory (src/columns) + +# Doesn't make sense to build shell without Readline. +if (HAVE_READLINE) add_subdirectory (src/shell) +endif (HAVE_READLINE) + add_subdirectory (doc) add_subdirectory (i18n) add_subdirectory (scripts) diff --git a/doc/man/task-tutorial.5.in b/doc/man/task-tutorial.5.in index fc6a0c657..0d6f5b51a 100644 --- a/doc/man/task-tutorial.5.in +++ b/doc/man/task-tutorial.5.in @@ -1897,95 +1897,6 @@ Deleting recurring task 14 'Pay taxes'. Deleting recurring task 15 'Pay taxes'. .RE -.SH SHELL -You can use the shell command to create a more immersive environment. Any task -command you run outside the shell can also be run inside the shell, without the -need to prefix every command with "task". - -.RS -$ task shell -.br -task 1.9.4 shell -.br - -.br -Enter any task command (such as 'list'), or hit 'Enter'. -.br -There is no need to include the 'task' command itself. -.br -Enter 'quit' to end the session. -.br - -.br -task> -.br -task> projects -.br - -.br -Project Tasks Pri:None Pri:L Pri:M Pri:H -.br -------- ----- -------- ----- ----- ----- -.br - 7 7 0 0 0 -.br -home 2 2 0 0 0 -.br -party 6 3 0 0 3 -.br - -.br -3 projects (15 tasks) -.br -task> tags -.br - -.br -Tag Count -.br -mall 2 -.br - -.br -1 tag (15 tasks) -.br -task> list -.br - -.br -ID Project Pri Due Active Age Description -.br --- ------- --- ---------- ------ ----- ------------------------------------ -.br - 2 party H 10/17/2010 2 hrs Select and book a venue -.br - 2010/10/16 11:20 Started task -.br - 2010/10/16 11:21 Stopped task -.br - 5 party H 10/22/2010 2 hrs Design invitations -.br - 1 party H 10/31/2010 2 hrs Select a free weekend in November -.br - 2010/10/16 00:00 the 13th looks good -.br - 9 home 10/31/2010 1 hr Pay rent at the end of the month -.br - 8 1 hr Select some Music for after dinner -.br - 3 party 2 hrs Mail invitations -.br - 4 party 2 hrs Select a caterer -.br - 6 party 2 hrs Print invitations -.br - -.br -8 tasks -.br -task> quit -.RE - .SH SPECIAL TAGS You've seen tags, but there are also 'special tags' that have effects on individual tasks. The 'nocolor' special tag causes the color rules to be diff --git a/doc/man/task.1.in b/doc/man/task.1.in index 70b2a58fb..6d8cb49c0 100644 --- a/doc/man/task.1.in +++ b/doc/man/task.1.in @@ -436,10 +436,6 @@ Displays the Taskwarrior logo. Lists all supported reports. This includes the built-in reports, and any custom reports you have defined. -.TP -.B task shell -Launches an interactive shell with all the task commands available. - .TP .B task show [all | substring] Shows all the current settings. If a diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in index a81c2027f..f241b12e2 100644 --- a/doc/man/taskrc.5.in +++ b/doc/man/taskrc.5.in @@ -399,11 +399,6 @@ $ task rc._forcecolor=yes list > file .RE .RE -.TP -.B shell.prompt=task> -The task shell command uses this value as a prompt. You can change it to any -string you like. - .TP .B active.indicator=* The character or string to show in the start.active column. Defaults to *. diff --git a/doc/misc/tutorial/active/run.200 b/doc/misc/tutorial/active/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/active/run.200 +++ b/doc/misc/tutorial/active/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/aliases/run.200 b/doc/misc/tutorial/aliases/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/aliases/run.200 +++ b/doc/misc/tutorial/aliases/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/annotations/run.200 b/doc/misc/tutorial/annotations/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/annotations/run.200 +++ b/doc/misc/tutorial/annotations/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/calendar/run.200 b/doc/misc/tutorial/calendar/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/calendar/run.200 +++ b/doc/misc/tutorial/calendar/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/charts/run.200 b/doc/misc/tutorial/charts/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/charts/run.200 +++ b/doc/misc/tutorial/charts/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/color/run.200 b/doc/misc/tutorial/color/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/color/run.200 +++ b/doc/misc/tutorial/color/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/configuration/run.200 b/doc/misc/tutorial/configuration/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/configuration/run.200 +++ b/doc/misc/tutorial/configuration/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/custom/run.200 b/doc/misc/tutorial/custom/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/custom/run.200 +++ b/doc/misc/tutorial/custom/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/defaults/run.200 b/doc/misc/tutorial/defaults/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/defaults/run.200 +++ b/doc/misc/tutorial/defaults/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/dependencies/run.200 b/doc/misc/tutorial/dependencies/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/dependencies/run.200 +++ b/doc/misc/tutorial/dependencies/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/due/run.200 b/doc/misc/tutorial/due/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/due/run.200 +++ b/doc/misc/tutorial/due/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/filters/run.200 b/doc/misc/tutorial/filters/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/filters/run.200 +++ b/doc/misc/tutorial/filters/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/help/run.200 b/doc/misc/tutorial/help/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/help/run.200 +++ b/doc/misc/tutorial/help/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/import_export/run.200 b/doc/misc/tutorial/import_export/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/import_export/run.200 +++ b/doc/misc/tutorial/import_export/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/info/run.200 b/doc/misc/tutorial/info/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/info/run.200 +++ b/doc/misc/tutorial/info/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/intro/run.200 b/doc/misc/tutorial/intro/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/intro/run.200 +++ b/doc/misc/tutorial/intro/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/modifications/run.200 b/doc/misc/tutorial/modifications/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/modifications/run.200 +++ b/doc/misc/tutorial/modifications/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/priorities/run.200 b/doc/misc/tutorial/priorities/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/priorities/run.200 +++ b/doc/misc/tutorial/priorities/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/projects/run.200 b/doc/misc/tutorial/projects/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/projects/run.200 +++ b/doc/misc/tutorial/projects/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/recurrence/run.200 b/doc/misc/tutorial/recurrence/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/recurrence/run.200 +++ b/doc/misc/tutorial/recurrence/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/reports/run.200 b/doc/misc/tutorial/reports/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/reports/run.200 +++ b/doc/misc/tutorial/reports/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/run.193 b/doc/misc/tutorial/run.193 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/run.193 +++ b/doc/misc/tutorial/run.193 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/run.200 b/doc/misc/tutorial/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/run.200 +++ b/doc/misc/tutorial/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/tags/run.200 b/doc/misc/tutorial/tags/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/tags/run.200 +++ b/doc/misc/tutorial/tags/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/doc/misc/tutorial/waiting/run.200 b/doc/misc/tutorial/waiting/run.200 index 5439eb75b..bfcfb2bec 100755 --- a/doc/misc/tutorial/waiting/run.200 +++ b/doc/misc/tutorial/waiting/run.200 @@ -306,20 +306,7 @@ printf "y\ny\n" | task 11 delete # y, y echo $ task list task list -# 17 Shell -echo Shell -------------------------------------------------------------- -echo $ task shell -#task shell -echo '> projects' -#> projects -echo '> tags' -#> tags -echo '> list' -#> list -echo '> quit' -#> quit - -# 18 Special tags +# 17 Special tags echo Special tags -------------------------------------------------------------- echo $ task 6 +nocolor task 6 +nocolor @@ -330,7 +317,7 @@ task tags echo $ task 6 -nocolor task 6 -nocolor -# 19 Waiting +# 18 Waiting echo Waiting -------------------------------------------------------------- echo $ task add Look for new apartment due:eoy task add Look for new apartment due:eoy @@ -354,7 +341,7 @@ task list echo $ task 11 rc.confirmation:no delete task 11 rc.confirmation:no delete -# 20 Dependencies +# 19 Dependencies echo Dependencies -------------------------------------------------------------- echo $ task list pro:party task list pro:party @@ -385,7 +372,7 @@ echo 'y' | task 2 done echo $ task 1 info task 1 info -# 21 Reports +# 20 Reports echo Reports -------------------------------------------------------------- echo $ task minimal task minimal @@ -414,7 +401,7 @@ task timesheet echo $ task next task next -# 22 Custom report +# 21 Custom report echo Custom report -------------------------------------------------------------- echo 'report.foo.description=My own report' >> x echo 'report.foo.columns=id,entry,description' >> x @@ -428,7 +415,7 @@ task show report.foo echo $ task foo task foo -# 23 Charts +# 22 Charts echo Charts -------------------------------------------------------------- echo $ task history task history @@ -441,7 +428,7 @@ task ghistory.annual echo $ task summary task summary -# 24 Advanced filters +# 23 Advanced filters echo Advanced filters -------------------------------------------------------------- echo $ task list task list @@ -470,7 +457,7 @@ task all status:pending echo $ task all status:waiting task all status:waiting -# 25 Import/export +# 24 Import/export echo Import/export -------------------------------------------------------------- echo $ task export.csv task export.csv @@ -507,7 +494,7 @@ printf "y\n" | task import file.yaml echo $ task new limit:2 task new limit:2 -# 26 Help +# 25 Help echo Help -------------------------------------------------------------- echo $ task help task help @@ -524,7 +511,7 @@ echo $ man task-faq echo $ man task-sync #man task-sync -# 27 Wrap up +# 26 Wrap up echo Wrap up -------------------------------------------------------------- echo $ task version task version diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index 86588648a..53fbfadd8 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -40,7 +40,6 @@ set (commands_SRCS Command.cpp Command.h CmdPull.cpp CmdPull.h CmdPush.cpp CmdPush.h CmdReports.cpp CmdReports.h - CmdShell.cpp CmdShell.h CmdShow.cpp CmdShow.h CmdStart.cpp CmdStart.h CmdStatistics.cpp CmdStatistics.h diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index e11b58aba..334ec23f3 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -77,7 +77,6 @@ #include #include #include -#include #include #include #include @@ -152,7 +151,6 @@ void Command::factory (std::map & all) c = new CmdPull (); all[c->keyword ()] = c; c = new CmdPush (); all[c->keyword ()] = c; c = new CmdReports (); all[c->keyword ()] = c; - c = new CmdShell (); all[c->keyword ()] = c; c = new CmdShow (); all[c->keyword ()] = c; c = new CmdStart (); all[c->keyword ()] = c; c = new CmdStatistics (); all[c->keyword ()] = c; diff --git a/src/en-US.h b/src/en-US.h index 19657e769..927ac102c 100644 --- a/src/en-US.h +++ b/src/en-US.h @@ -396,7 +396,6 @@ #define STRING_CMD_IMPORT_NOT_JSON "Not a JSON object: {1}" #define STRING_CMD_IMPORT_NO_DESC "Annotation is missing a description: {1}" #define STRING_CMD_IMPORT_NO_ENTRY "Annotation is missing an entry date: {1}" -#define STRING_CMD_SHELL_USAGE "Launches an interactive shell" #define STRING_CMD_SHELL_HELP1 "Enter any task command (such as 'list'), or hit 'Enter'." #define STRING_CMD_SHELL_HELP2 "There is no need to include the 'task' command itself." #define STRING_CMD_SHELL_HELP3 "Enter 'quit' (or 'bye', 'exit') to end the session." @@ -970,5 +969,8 @@ #define STRING_UTIL_KIBIBYTES "KiB" #define STRING_UTIL_BYTES "B" +// shell +#define STRING_SHELL_UNKOWN_OPTION "Ignoring unkown option: " + #endif diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt index a767a5feb..69450e47d 100644 --- a/src/shell/CMakeLists.txt +++ b/src/shell/CMakeLists.txt @@ -3,9 +3,10 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/columns + ${CMAKE_SOURCE_DIR}/src/shell ${TASK_INCLUDE_DIRS}) -set (tasksh_SRCS shell.cpp shell.h) +set (tasksh_SRCS Readline.cpp Readline.h) add_library (tasksh STATIC ${tasksh_SRCS}) add_executable (tasksh_executable main.cpp) diff --git a/src/shell/main.cpp b/src/shell/main.cpp index 86f2cd170..971df7982 100644 --- a/src/shell/main.cpp +++ b/src/shell/main.cpp @@ -1,5 +1,150 @@ -int main() +//////////////////////////////////////////////////////////////////////////////// +// taskwarrior - a command line task list manager. +// +// Copyright 2006-2012, Paul Beckingham, Federico Hernandez. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// http://www.opensource.org/licenses/mit-license.php +// +//////////////////////////////////////////////////////////////////////////////// + +#define L10N // Localization complete. + +#include +#include +#include + +#ifdef CYGWIN +#include +#else +#include +#endif + +#include +#include +#include +#include +#include +#include + +Context context; + +#ifdef HAVE_SRANDOM +#define srand(x) srandom(x) +#endif + +//////////////////////////////////////////////////////////////////////////////// +int main (int argc, const char** argv) { - return 0; + // Set up randomness. +#ifdef CYGWIN + srand (time (NULL)); +#else + struct timeval tv; + gettimeofday (&tv, NULL); + srand (tv.tv_usec); +#endif + + int status = 0; + + if (argc == 2 && !strcmp (argv[1], "--version")) + { + std::cout << VERSION << "\n"; + } + else + { + if (argc > 1) + { + std::cerr << STRING_SHELL_UNKOWN_OPTION << argv[1] << "\n"; + } + + // Begining initilaization + status = context.initialize (0, NULL); + + // Display some kind of welcome message. + Color bold (Color::nocolor, Color::nocolor, false, true, false); + std::cout << (context.color () ? bold.colorize (PACKAGE_STRING) : PACKAGE_STRING) + << " shell\n\n" + << STRING_CMD_SHELL_HELP1 << "\n" + << STRING_CMD_SHELL_HELP2 << "\n" + << STRING_CMD_SHELL_HELP3 << "\n\n"; + + // Make a copy because context.clear will delete them. + std::string permanent_overrides; + std::vector ::iterator i; + for (i = context.a3.begin (); i != context.a3.end (); ++i) + { + if (i->_category == Arg::cat_rc || + i->_category == Arg::cat_override) + { + if (i != context.a3.begin ()) + permanent_overrides += " "; + + permanent_overrides += i->_raw; + } + } + + std::string input, prompt(context.config.get ("shell.prompt") + " "); + + std::vector quit_commands; + quit_commands.push_back ("quit"); + quit_commands.push_back ("exit"); + quit_commands.push_back ("bye"); + + // The event loop. + while (1) + { + context.clear (); + + input = Readline::gets (prompt); + if (std::find (quit_commands.begin (), quit_commands.end (), + lowerCase (input)) != quit_commands.end ()) + break; + + try + { + Wordexp w ("task " + trim (input + permanent_overrides)); + status = context.initialize (w.argc (), (const char**)w.argv ()); + if (status == 0) + status = context.run (); + } + + catch (const std::string& error) + { + std::cerr << error << "\n"; + status = -1; + break; + } + + catch (...) + { + std::cerr << STRING_UNKNOWN_ERROR << "\n"; + status = -2; + break; + } + } + } + + // No need to repeat any overrides after the shell quits. + context.clearMessages (); + return status; } +////////////////////////////////////////////////////////////////////////////////