diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 3ea7dcf6..232a6d75 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -226,7 +226,7 @@ clean.pkg-exclude-built-today: rm -f $(EXCLUDES_FILE).tmp built-today.tmp 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: @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 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) pkg-init-%: diff --git a/scripts/jw-pkg b/scripts/jw-pkg index ca35f928..49e02696 100644 --- a/scripts/jw-pkg +++ b/scripts/jw-pkg @@ -22,8 +22,8 @@ cat << EOT install: install packages in [arguments] update: update all jannet software on the system restore: restore a previous jannet software version state - info: query information about installed software packages - info-projects: query information about installed software projects + list: query information about installed software packages + list-projects: query information about installed software projects checklog: update the installation log file if necessary rpmnew: remove superfluous rpmnew files and show conflicts for others @@ -311,14 +311,14 @@ checklog) line=`jannet info | tr -s " "` echo $line ;; -info) +list) if [ "$opt_verbose" = true ]; then list_packages "$@" | xargs -r rpm -qi else list_packages "$@" | xargs -r rpm -q fi ;; -info-projects) +list-projects) list_projects "$@" ;; cpp-glib)