janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

jw-pkg info-projects: Rename to list-xxx

Browse source 
Rename jw-pkg commands "info" and "info-projects" to "list-info" and
"list-projects", respectively.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-13 11:50:27 +00:00
commit 3e95eb58e3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/projects-dir.mk
View file

@ -226,7 +226,7 @@ clean.pkg-exclude-built-today:
rm -f $(EXCLUDES_FILE).tmp built-today.tmp rm -f $(EXCLUDES_FILE).tmp built-today.tmp
pkg-exclude-installed: pkg-exclude-installed:
$(JW_PKG) info-projects | while read p; do sed -i "s/^# *$$p$$/$$p/" $(EXCLUDES_FILE) ; done $(JW_PKG) list-projects | while read p; do sed -i "s/^# *$$p$$/$$p/" $(EXCLUDES_FILE) ; done
pkg-list-groups: pkg-list-groups:
@find . -name project.conf | xargs sed '/^ *group *=/!d; s/group *= *//; s/"//g' | sort -u @find . -name project.conf | xargs sed '/^ *group *=/!d; s/group *= *//; s/"//g' | sort -u
@ -237,7 +237,7 @@ pkg-release-all:
/bin/bash ./packager-client/scripts/packager-client-2.sh /bin/bash ./packager-client/scripts/packager-client-2.sh
pkg-fetch-from-%: pkg-fetch-from-%:
ssh $* /opt/jw-base/bin/jw-pkg info -s > $(PROJECTS_TXT).tmp ssh $* /opt/jw-base/bin/jw-pkg list -s > $(PROJECTS_TXT).tmp
mv $(PROJECTS_TXT).tmp $(PROJECTS_TXT) mv $(PROJECTS_TXT).tmp $(PROJECTS_TXT)
pkg-init-%: pkg-init-%:

8
scripts/jw-pkg
View file

@ -22,8 +22,8 @@ cat << EOT
install: install packages in [arguments] install: install packages in [arguments]
update: update all jannet software on the system update: update all jannet software on the system
restore: restore a previous jannet software version state restore: restore a previous jannet software version state
info: query information about installed software packages list: query information about installed software packages
info-projects: query information about installed software projects list-projects: query information about installed software projects
checklog: update the installation log file if necessary checklog: update the installation log file if necessary
rpmnew: remove superfluous rpmnew files and show conflicts rpmnew: remove superfluous rpmnew files and show conflicts
for others for others
@ -311,14 +311,14 @@ checklog)
line=`jannet info | tr -s " "` line=`jannet info | tr -s " "`
echo $line echo $line
;; ;;
info) list)
if [ "$opt_verbose" = true ]; then if [ "$opt_verbose" = true ]; then
list_packages "$@" | xargs -r rpm -qi list_packages "$@" | xargs -r rpm -qi
else else
list_packages "$@" | xargs -r rpm -q list_packages "$@" | xargs -r rpm -q
fi fi
;; ;;
info-projects) list-projects)
list_projects "$@" list_projects "$@"
;; ;;
cpp-glib) cpp-glib)