From 7d7f32e6aa462c5d7b017048d3d8e9021dd8bafa Mon Sep 17 00:00:00 2001 From: "D.Haritha" Date: Tue, 19 Nov 2024 10:29:26 +0530 Subject: [PATCH 1/5] Added vim-airline and vim-airline-themes info in the doc --- docs/Guides/VimOnZOS.md | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/docs/Guides/VimOnZOS.md b/docs/Guides/VimOnZOS.md index b85d3f791..79b6b3c51 100644 --- a/docs/Guides/VimOnZOS.md +++ b/docs/Guides/VimOnZOS.md @@ -97,7 +97,7 @@ This configuration tells vim-plug to manage plugins and specifies vim-gnupg as a #### Plugins for GPG -Add the following in .vimrc file between plu#begin and plug#end: +Add the following in .vimrc file between plug#begin and plug#end: > " Install the vim-gnupg plugin
> Plug 'jamessan/vim-gnupg' @@ -123,10 +123,32 @@ When you save the file, vim-gnupg will automatically encrypt it > vim secretfile.gpg +#### vim-airline +vim-airline is a lightweight status/tabline plugin for Vim. It replaces the standard status line with a more aesthetically pleasing and feature-rich status line. It provides essential information like the current file, line number, file encoding, file type, and Git branch in a minimalistic and visually appealing manner. + +#### vim-airline-themes +vim-airline-themes is a companion plugin to vim-airline that offers a variety of themes to customize the appearance of the status line. This plugin makes it easy to switch themes to match your preferred color scheme or to enhance your coding environment's visual appeal. + + +Add the following in .vimrc file between plug#begin and plug#end: + +> " Install the airline plugin
+> Plug 'vim-airline/vim-airline'

+> " Install the airline-themes plugin
+> Plug 'vim-airline/vim-airline-themes' + +#### Install vim-airline & vim-airline-themes Plugin + +After saving the .vimrc file, open Vim and run the following command to install the plugins + +> :PlugInstall + +For more details on Airline and Airline-themes, visit https://github.com/vim-airline/vim-airline & https://github.com/vim-airline/vim-airline-themes. + #### NERDTree In addition to cscope and ctags, VIM users on z/OS may also want to consider using NERDTree, a plugin that allows users to view and navigate the directory structure of a codebase. This can be useful for quickly switching between files and folders, and is especially useful for working with large codebases that have many different directories and files. -Add the following in .vimrc file between plu#begin and plug#end: +Add the following in .vimrc file between plug#begin and plug#end: > " Install the NERDTree plugin
> Plug 'preservim/nerdtree' @@ -149,7 +171,7 @@ To quote [its README](https://github.com/tpope/vim-fugitive?tab=readme-ov-file#f This plugin allows VIM users on z/OS to interact with Git repositories directly from within the editor. This can be incredibly useful for managing code changes and collaborating with other developers, as it allows users to easily manage branches, commit changes, and push code to remote repositories. -Add the following in .vimrc file between plu#begin and plug#end: +Add the following in .vimrc file between plug#begin and plug#end: > " Install the Fugitive plugin
> Plug 'tpope/vim-fugitive' @@ -166,7 +188,7 @@ For more details on vim-fugitive, visit [https://github.com/tpope/vim-fugitive]( > A Vim plugin which shows a git diff in the sign column. It shows which lines have been added, modified, or removed. You can also preview, stage, and undo individual hunks; and stage partial hunks. The plugin also provides a hunk text object. -Add the following in .vimrc file between plu#begin and plug#end: +Add the following in .vimrc file between plug#begin and plug#end: > " Install the gitgutter plugin
> Plug 'airblade/vim-gitgutter' @@ -196,6 +218,12 @@ For more details on vim-gitgutter, visit https://github.com/airblade/vim-gitgutt > " Install the gitgutter plugin
> Plug 'airblade/vim-gitgutter'

> +> " Install the airline plugin
+> Plug 'vim-airline/vim-airline'

+> +> " Install the airline-themes plugin
+> Plug 'vim-airline/vim-airline-themes'

+> > " Initialize plugin system
> call plug#end() From 9047e3c55c89f48cb8552931264c597ac06276ca Mon Sep 17 00:00:00 2001 From: D Harithamma Date: Tue, 19 Nov 2024 22:50:55 -0500 Subject: [PATCH 2/5] Added check before we start agent --- bin/zopen-install | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bin/zopen-install b/bin/zopen-install index c1b9983d1..d4fffca16 100755 --- a/bin/zopen-install +++ b/bin/zopen-install @@ -31,7 +31,7 @@ startGPGAgent() if ps -ef | grep -v grep | grep "gpg-agent" > /dev/null; then printInfo "gpg-agent started successfully." else - printError "Failed to start gpg-agent. Install GPG using \"zopen install gpg -y\" command." + printWarning "Failed to start gpg-agent. Reinstall or Upgrade GPG using \"zopen install --reinstall gpg -y\" or \"zopen upgrade gpg -y\" command." fi } @@ -60,7 +60,13 @@ verifySignatureOfPax() PUBLIC_KEY_FILE="$zopen_tmp_dir/scriptpubkey.$LOGNAME.$$.asc" printf "%b" "$SIGNATURE" | tr -d '"' > "$SIGNATURE_FILE" printf "%b" "$PUBLIC_KEY" | tr -d '"' > "$PUBLIC_KEY_FILE" - startGPGAgent + + if ! command -v jq > /dev/null; then + printWarning "GPG is not installed" + else + startGPGAgent + fi + printVerbose "Importing public key..." [ -f "$PUBLIC_KEY_FILE" ] && gpg --no-default-keyring --keyring "$TMP_GPG_DIR/pubring.kbx" --batch --yes --import "$PUBLIC_KEY_FILE" if [ $? -ne 0 ]; then From cf59681f7a6985cc5fd4cb8e13a2747da2fe9326 Mon Sep 17 00:00:00 2001 From: D Harithamma Date: Tue, 19 Nov 2024 23:03:05 -0500 Subject: [PATCH 3/5] Added check before we start agent --- bin/zopen-install | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/zopen-install b/bin/zopen-install index d4fffca16..91ceb4c4a 100755 --- a/bin/zopen-install +++ b/bin/zopen-install @@ -61,11 +61,7 @@ verifySignatureOfPax() printf "%b" "$SIGNATURE" | tr -d '"' > "$SIGNATURE_FILE" printf "%b" "$PUBLIC_KEY" | tr -d '"' > "$PUBLIC_KEY_FILE" - if ! command -v jq > /dev/null; then - printWarning "GPG is not installed" - else - startGPGAgent - fi + startGPGAgent printVerbose "Importing public key..." [ -f "$PUBLIC_KEY_FILE" ] && gpg --no-default-keyring --keyring "$TMP_GPG_DIR/pubring.kbx" --batch --yes --import "$PUBLIC_KEY_FILE" @@ -479,7 +475,12 @@ handlePackageInstall() is_greater=$(echo "$metadataVersion > 0.1" | bc -l) if [ "$is_greater" -eq 1 ] && ! $skipverify; then - verifySignatureOfPax + if ! command -v gpg> /dev/null; then + skipverify=false; + printWarning "GPG is not installed" + else + verifySignatureOfPax + fi fi if ! runLogProgress "pax -rf ${pax} -p p ${paxredirect} ${redirectToDevNull}" "Expanding ${pax}" "Expanded"; then printWarning "Errors unpaxing, package directory state unknown." From 49b494c8dc70ffaede51e349ad07748138491e90 Mon Sep 17 00:00:00 2001 From: "D.Haritha" Date: Wed, 20 Nov 2024 19:02:25 +0530 Subject: [PATCH 4/5] Added tagbar details --- docs/Guides/VimOnZOS.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/Guides/VimOnZOS.md b/docs/Guides/VimOnZOS.md index 79b6b3c51..02cb7fca5 100644 --- a/docs/Guides/VimOnZOS.md +++ b/docs/Guides/VimOnZOS.md @@ -145,6 +145,23 @@ After saving the .vimrc file, open Vim and run the following command to install For more details on Airline and Airline-themes, visit https://github.com/vim-airline/vim-airline & https://github.com/vim-airline/vim-airline-themes. +#### Tagbar +Tagbar is a source code browsing tool that displays the outline of the code currently open in a Vim window. It leverages the ctags utility to generate tags—indexed elements in your code—allowing for efficient and quick navigation. Tagbar’s sidebar acts like a visual table of contents, making it simple to locate specific code segments without scrolling or searching manually. + + +Add the following in .vimrc file between plug#begin and plug#end: + +> " Install the Tagbar plugin
+> Plug 'preservim/tagbar' + +#### Install Tagbar Plugin + +After saving the .vimrc file, open Vim and run the following command to install the plugins + +> :PlugInstall + +For more details on Tagbar, visit https://github.com/preservim/tagbar. + #### NERDTree In addition to cscope and ctags, VIM users on z/OS may also want to consider using NERDTree, a plugin that allows users to view and navigate the directory structure of a codebase. This can be useful for quickly switching between files and folders, and is especially useful for working with large codebases that have many different directories and files. @@ -209,6 +226,9 @@ For more details on vim-gitgutter, visit https://github.com/airblade/vim-gitgutt > " Install the vim-gnupg plugin
> Plug 'jamessan/vim-gnupg'

> +> " Install the Tagbar plugin
+> Plug 'preservim/tagbar'

+> > " Install the NERDTree plugin
> Plug 'preservim/nerdtree'

> From a91b6b4d6ea6f61016c8814891aa080eb1837a20 Mon Sep 17 00:00:00 2001 From: Igor Todorovski <39890068+IgorTodorovskiIBM@users.noreply.github.com> Date: Wed, 20 Nov 2024 12:04:00 -0500 Subject: [PATCH 5/5] Update bin/zopen-install --- bin/zopen-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/zopen-install b/bin/zopen-install index d258a65f4..22010bfd5 100755 --- a/bin/zopen-install +++ b/bin/zopen-install @@ -31,7 +31,7 @@ startGPGAgent() if ps -ef | grep -v grep | grep "gpg-agent" > /dev/null; then printInfo "gpg-agent started successfully." else - printWarning "Failed to start gpg-agent. Reinstall or Upgrade GPG using \"zopen install --reinstall gpg -y\" or \"zopen upgrade gpg -y\" command." + printWarning "Failed to start the gpg-agent. Reinstall or upgrade GPG using \"zopen install --reinstall gpg -y\" or \"zopen upgrade gpg -y\" command." fi }