Skip to content

Commit

Permalink
Deprecate legacy zypp-refresh script
Browse files Browse the repository at this point in the history
  • Loading branch information
mlandres committed Apr 7, 2020
1 parent 14c907a commit abd681a
Show file tree
Hide file tree
Showing 8 changed files with 85 additions and 236 deletions.
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,23 @@ INSTALL(
DESTINATION ${SYSCONFDIR}/zypp/apt-packagemap.d
)


# installation_sources script (deprecated)
INSTALL(
PROGRAMS deprecated/installation_sources
DESTINATION ${INSTALL_PREFIX}/bin
)

# zypp-refresh script (deprecated)
INSTALL(
PROGRAMS deprecated/zypp-refresh
DESTINATION ${INSTALL_PREFIX}/sbin
)
INSTALL (
FILES deprecated/zypp-refresh.8
DESTINATION "${INSTALL_PREFIX}/share/man/man8"
)
INSTALL(
FILES deprecated/zypp-refresh.lr
DESTINATION ${SYSCONFDIR}/logrotate.d
)
9 changes: 9 additions & 0 deletions deprecated/zypp-refresh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
export ZYPP_LOGFILE=${ZYPP_LOGFILE:-/var/log/zypp-refresh.log}
/usr/bin/zypper --non-interactive refresh --force
cat >&2 <<EOF
***
*** This script is deprecated and will be removed in future versions!
***
EOF
exit 1
59 changes: 59 additions & 0 deletions deprecated/zypp-refresh.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
'\" t
.\" Title: zypp-refresh
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
.\" Date: 03/18/2020
.\" Manual: ZYPPER
.\" Source: SUSE Linux
.\" Language: English
.\"
.TH "ZYPP\-REFRESH" "8" "03/18/2020" "SUSE Linux" "ZYPPER"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
zypp-refresh \- Autorefresh metadata of all enabled repositories
.SH "SYNOPSIS"
.sp
\fBzypp\-refresh\fR
.SH "DESCRIPTION"
.sp
\fBzypp\-refresh\fR refreshes metadata of all enabled repositories which have \fBautorefresh\fR turned on (see \fBzypper lr\fR)\&. For use e\&.g\&. in cron jobs or scripts\&.
.SH "FILES"
.PP
\fB/var/log/zypp\-refresh\&.log\fR
.RS 4
\fBzypp\-refresh\fR
logfile
.RE
.SH "AUTHORS"
.sp
.if n \{\
.RS 4
.\}
.nf
Jan Kupec <>
Michael Andres <ma@suse\&.de>
.fi
.if n \{\
.RE
.\}
.SH "SEE ALSO"
.sp
zypper(8)
File renamed without changes.
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ SET (my_MAN1
needs-restarting.1)

SET (my_MAN8
zypper.8 zypper-log.8 zypp-refresh.8)
zypper.8 zypper-log.8)

ADD_A2X_MANPAGES(
MAN_INST_PATH ${MANDIR}
Expand Down
34 changes: 0 additions & 34 deletions doc/zypp-refresh.8.txt

This file was deleted.

12 changes: 1 addition & 11 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -250,16 +250,6 @@ INSTALL( FILES
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/zypper/xml
)

# zypp-refresh utility
ADD_EXECUTABLE( zypp-refresh zypp-refresh.cc )
TARGET_LINK_LIBRARIES( zypp-refresh ${ZYPP_LIBRARY} )
SET_TARGET_PROPERTIES( zypp-refresh PROPERTIES LINK_FLAGS "-pie -Wl,-z,relro,-z,now")
SET_TARGET_PROPERTIES( zypp-refresh PROPERTIES COMPILE_FLAGS "-fwhole-program -fpie -fPIE")
INSTALL(
TARGETS zypp-refresh
RUNTIME DESTINATION ${INSTALL_PREFIX}/sbin
)

# bash completion script
INSTALL(
FILES bash-completion.sh
Expand All @@ -269,7 +259,7 @@ INSTALL(

# logrotate config file
INSTALL(
FILES zypper.lr zypp-refresh.lr
FILES zypper.lr
DESTINATION ${SYSCONFDIR}/logrotate.d
)

Expand Down
190 changes: 0 additions & 190 deletions src/zypp-refresh.cc

This file was deleted.

0 comments on commit abd681a

Please sign in to comment.