From 5b4c61165c6854832dd6fbd6af2699413359c940 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Tue, 14 Aug 2018 09:33:04 +0200
Subject: [PATCH] cta/CTA#299 Drop redundant -tape- qualifier from the names of
the cta-tape-acs- tools
Done.
---
cta.spec.in | 16 +++---
mediachanger/acs/AcsDismountCmdLine.cpp | 2 +-
mediachanger/acs/AcsMountCmdLine.cpp | 2 +-
mediachanger/acs/AcsQueryDriveCmdLine.cpp | 2 +-
mediachanger/acs/AcsQueryVolumeCmdLine.cpp | 2 +-
mediachanger/acs/CMakeLists.txt | 52 +++++++++----------
...cs-dismount.1cta => cta-acs-dismount.1cta} | 8 +--
...tape-acs-mount.1cta => cta-acs-mount.1cta} | 8 +--
...uerydrive.1cta => cta-acs-querydrive.1cta} | 8 +--
...ryvolume.1cta => cta-acs-queryvolume.1cta} | 4 +-
10 files changed, 52 insertions(+), 52 deletions(-)
rename mediachanger/acs/{cta-tape-acs-dismount.1cta => cta-acs-dismount.1cta} (88%)
rename mediachanger/acs/{cta-tape-acs-mount.1cta => cta-acs-mount.1cta} (89%)
rename mediachanger/acs/{cta-tape-acs-querydrive.1cta => cta-acs-querydrive.1cta} (88%)
rename mediachanger/acs/{cta-tape-acs-queryvolume.1cta => cta-acs-queryvolume.1cta} (95%)
diff --git a/cta.spec.in b/cta.spec.in
index 0a0b2729d7..14846ac09c 100644
--- a/cta.spec.in
+++ b/cta.spec.in
@@ -362,14 +362,14 @@ castor (Cern Advanced STORage system)
ASC tools for CASTOR tape developers
%files -n cta-tape-developer-acs-tools
%defattr(-,root,root)
-%attr(0755,root,root) /usr/bin/cta-tape-acs-queryvolume
-%attr(0755,root,root) /usr/bin/cta-tape-acs-dismount
-%attr(0755,root,root) /usr/bin/cta-tape-acs-mount
-%attr(0755,root,root) /usr/bin/cta-tape-acs-querydrive
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-tape-acs-queryvolume.1cta.gz
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-tape-acs-mount.1cta.gz
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-tape-acs-dismount.1cta.gz
-%attr(0644,root,root) %doc /usr/share/man/man1/cta-tape-acs-querydrive.1cta.gz
+%attr(0755,root,root) /usr/bin/cta-acs-queryvolume
+%attr(0755,root,root) /usr/bin/cta-acs-dismount
+%attr(0755,root,root) /usr/bin/cta-acs-mount
+%attr(0755,root,root) /usr/bin/cta-acs-querydrive
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-acs-queryvolume.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-acs-mount.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-acs-dismount.1cta.gz
+%attr(0644,root,root) %doc /usr/share/man/man1/cta-acs-querydrive.1cta.gz
%package -n cta-common
Summary: CERN Tape Archive common items
diff --git a/mediachanger/acs/AcsDismountCmdLine.cpp b/mediachanger/acs/AcsDismountCmdLine.cpp
index b18cca85a0..64b641ccd8 100644
--- a/mediachanger/acs/AcsDismountCmdLine.cpp
+++ b/mediachanger/acs/AcsDismountCmdLine.cpp
@@ -148,7 +148,7 @@ std::string cta::mediachanger::acs::AcsDismountCmdLine::getUsage() {
usage <<
"Usage:\n"
"\n"
- " cta-tape-acs-dismount [options] VID DRIVE_SLOT\n"
+ " cta-acs-dismount [options] VID DRIVE_SLOT\n"
"\n"
"Where:\n"
"\n"
diff --git a/mediachanger/acs/AcsMountCmdLine.cpp b/mediachanger/acs/AcsMountCmdLine.cpp
index 09c7c900c7..19d6229971 100644
--- a/mediachanger/acs/AcsMountCmdLine.cpp
+++ b/mediachanger/acs/AcsMountCmdLine.cpp
@@ -144,7 +144,7 @@ std::string cta::mediachanger::acs::AcsMountCmdLine::getUsage() {
usage <<
"Usage:\n"
"\n"
- " cta-tape-acs-mount [options] VID DRIVE_SLOT\n"
+ " cta-acs-mount [options] VID DRIVE_SLOT\n"
"\n"
"Where:\n"
"\n"
diff --git a/mediachanger/acs/AcsQueryDriveCmdLine.cpp b/mediachanger/acs/AcsQueryDriveCmdLine.cpp
index 14581edd8f..aef7dc7982 100644
--- a/mediachanger/acs/AcsQueryDriveCmdLine.cpp
+++ b/mediachanger/acs/AcsQueryDriveCmdLine.cpp
@@ -171,6 +171,6 @@ void cta::mediachanger::acs::AcsQueryDriveCmdLine::processOption(const int opt)
// getProgramName
//------------------------------------------------------------------------------
std::string cta::mediachanger::acs::AcsQueryDriveCmdLine::getProgramName() {
- return "cta-tape-acs-querydrive";
+ return "cta-acs-querydrive";
}
diff --git a/mediachanger/acs/AcsQueryVolumeCmdLine.cpp b/mediachanger/acs/AcsQueryVolumeCmdLine.cpp
index 089c682358..66e3a8b349 100644
--- a/mediachanger/acs/AcsQueryVolumeCmdLine.cpp
+++ b/mediachanger/acs/AcsQueryVolumeCmdLine.cpp
@@ -125,7 +125,7 @@ std::string cta::mediachanger::acs::AcsQueryVolumeCmdLine::getUsage() {
std::ostringstream usage;
usage <<
"Usage:\n"
- " cta-tape-acs-queryvolume [options] VID\n"
+ " cta-acs-queryvolume [options] VID\n"
"\n"
"Where:\n"
"\n"
diff --git a/mediachanger/acs/CMakeLists.txt b/mediachanger/acs/CMakeLists.txt
index fd7114d4b8..12970c5a59 100644
--- a/mediachanger/acs/CMakeLists.txt
+++ b/mediachanger/acs/CMakeLists.txt
@@ -44,7 +44,7 @@ set_target_properties (cta-acs PROPERTIES
################################################################################
# Rules to build and install castor-tape-acs-dismount
################################################################################
-message(STATUS "Adding cta-tape-acs-dismount target")
+message(STATUS "Adding cta-acs-dismount target")
set (ACS_DISMOUNT_SRC_FILES
Acs.cpp
AcsCmd.cpp
@@ -55,18 +55,18 @@ set (ACS_DISMOUNT_SRC_FILES
AcsDismountCmdMain.cpp
CmdLineTool.cpp
AcsDebugBuf.cpp)
-add_executable (cta-tape-acs-dismount ${ACS_DISMOUNT_SRC_FILES})
-set_target_properties (cta-tape-acs-dismount PROPERTIES
+add_executable (cta-acs-dismount ${ACS_DISMOUNT_SRC_FILES})
+set_target_properties (cta-acs-dismount PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX)
-target_link_libraries (cta-tape-acs-dismount
+target_link_libraries (cta-acs-dismount
ctacommon
${STK_LIBRARIES})
-install (TARGETS cta-tape-acs-dismount DESTINATION /usr/bin)
-install (FILES cta-tape-acs-dismount.1cta DESTINATION /usr/share/man/man1)
+install (TARGETS cta-acs-dismount DESTINATION /usr/bin)
+install (FILES cta-acs-dismount.1cta DESTINATION /usr/share/man/man1)
################################################################################
-# Rules to build and install cta-tape-acs-mount
+# Rules to build and install cta-acs-mount
################################################################################
set (ACS_MOUNT_SRC_FILES
Acs.cpp
@@ -78,20 +78,20 @@ set (ACS_MOUNT_SRC_FILES
AcsMountCmdMain.cpp
CmdLineTool.cpp
AcsDebugBuf.cpp)
-add_executable (cta-tape-acs-mount ${ACS_MOUNT_SRC_FILES})
-set_target_properties (cta-tape-acs-mount PROPERTIES
+add_executable (cta-acs-mount ${ACS_MOUNT_SRC_FILES})
+set_target_properties (cta-acs-mount PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX)
-target_link_libraries (cta-tape-acs-mount
+target_link_libraries (cta-acs-mount
ctacommon
${STK_LIBRARIES})
-install (TARGETS cta-tape-acs-mount DESTINATION /usr/bin)
-install (FILES cta-tape-acs-mount.1cta DESTINATION /usr/share/man/man1)
+install (TARGETS cta-acs-mount DESTINATION /usr/bin)
+install (FILES cta-acs-mount.1cta DESTINATION /usr/share/man/man1)
################################################################################
-# Rules to build and install cta-tape-acs-queryvolume
+# Rules to build and install cta-acs-queryvolume
################################################################################
-message(STATUS "Adding cta-tape-acs-queryvolume target")
+message(STATUS "Adding cta-acs-queryvolume target")
set (ACS_QUERYVOLUME_SRC_FILES
Acs.cpp
AcsCmd.cpp
@@ -103,21 +103,21 @@ set (ACS_QUERYVOLUME_SRC_FILES
CmdLineTool.cpp
AcsDebugBuf.cpp)
-add_executable (cta-tape-acs-queryvolume ${ACS_QUERYVOLUME_SRC_FILES})
-target_link_libraries (cta-tape-acs-queryvolume
+add_executable (cta-acs-queryvolume ${ACS_QUERYVOLUME_SRC_FILES})
+target_link_libraries (cta-acs-queryvolume
ctacommon
${STK_LIBRARIES})
-set_target_properties (cta-tape-acs-queryvolume PROPERTIES
+set_target_properties (cta-acs-queryvolume PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX)
-install (TARGETS cta-tape-acs-queryvolume
+install (TARGETS cta-acs-queryvolume
DESTINATION /usr/bin)
-install (FILES cta-tape-acs-queryvolume.1cta DESTINATION /usr/share/man/man1)
+install (FILES cta-acs-queryvolume.1cta DESTINATION /usr/share/man/man1)
################################################################################
-# Rules to build and install cta-tape-acs-querydrive
+# Rules to build and install cta-acs-querydrive
################################################################################
-message(STATUS "Adding cta-tape-acs-querydrive target")
+message(STATUS "Adding cta-acs-querydrive target")
set (ACS_QUERYDRIVE_SRC_FILES
Acs.cpp
AcsCmd.cpp
@@ -129,13 +129,13 @@ set (ACS_QUERYDRIVE_SRC_FILES
CmdLineTool.cpp
AcsDebugBuf.cpp)
-add_executable (cta-tape-acs-querydrive ${ACS_QUERYDRIVE_SRC_FILES})
-target_link_libraries (cta-tape-acs-querydrive
+add_executable (cta-acs-querydrive ${ACS_QUERYDRIVE_SRC_FILES})
+target_link_libraries (cta-acs-querydrive
ctacommon
${STK_LIBRARIES})
-set_target_properties (cta-tape-acs-querydrive PROPERTIES
+set_target_properties (cta-acs-querydrive PROPERTIES
COMPILE_FLAGS -I/usr/include/CDK
COMPILE_DEFINITIONS LINUX)
-install (TARGETS cta-tape-acs-querydrive
+install (TARGETS cta-acs-querydrive
DESTINATION /usr/bin)
-install (FILES cta-tape-acs-querydrive.1cta DESTINATION /usr/share/man/man1)
+install (FILES cta-acs-querydrive.1cta DESTINATION /usr/share/man/man1)
diff --git a/mediachanger/acs/cta-tape-acs-dismount.1cta b/mediachanger/acs/cta-acs-dismount.1cta
similarity index 88%
rename from mediachanger/acs/cta-tape-acs-dismount.1cta
rename to mediachanger/acs/cta-acs-dismount.1cta
index 76e568a9fc..39cc0c6fd2 100644
--- a/mediachanger/acs/cta-tape-acs-dismount.1cta
+++ b/mediachanger/acs/cta-acs-dismount.1cta
@@ -16,16 +16,16 @@
.TH CASTOR-TAPE-ACS-DISMOUNT "1cta" "$Date: 2013/10/09 14:00:00 $" CASTOR "CASTOR"
.SH NAME
-cta-tape-acs-dismount \- dismount a volume
+cta-acs-dismount \- dismount a volume
.SH SYNOPSIS
-.BI "cta-tape-acs-dismount [options] VID DRIVE_SLOT"
+.BI "cta-acs-dismount [options] VID DRIVE_SLOT"
.SH DESCRIPTION
-\fBWarning\fP, \fBcta-tape-acs-dismount\fP is a developer tool and is
+\fBWarning\fP, \fBcta-acs-dismount\fP is a developer tool and is
therefore subject to change in and even removal from a future release of CASTOR.
End users should not rely on this tool to operate their CASTOR installation.
-\fBcta-tape-acs-dismount\fP dismounts the volume with the specfied \fBVID\fP
+\fBcta-acs-dismount\fP dismounts the volume with the specfied \fBVID\fP
from the drive located in the specified \fBDRIVE_SLOT\fP of the tape library.
The format of \fBDRIVE_SLOT\fP is as follows:
diff --git a/mediachanger/acs/cta-tape-acs-mount.1cta b/mediachanger/acs/cta-acs-mount.1cta
similarity index 89%
rename from mediachanger/acs/cta-tape-acs-mount.1cta
rename to mediachanger/acs/cta-acs-mount.1cta
index a64dff0389..1adc058396 100644
--- a/mediachanger/acs/cta-tape-acs-mount.1cta
+++ b/mediachanger/acs/cta-acs-mount.1cta
@@ -17,16 +17,16 @@
.TH CTA-TAPE-ACS-MOUNT "1cta" "$Date: 2013/10/09 14:00:00 $" CTA "CTA"
.SH NAME
-cta-tape-acs-mount \- mount a volume
+cta-acs-mount \- mount a volume
.SH SYNOPSIS
-.BI "cta-tape-acs-mount [options] VID DRIVE_SLOT"
+.BI "cta-acs-mount [options] VID DRIVE_SLOT"
.SH DESCRIPTION
-\fBWarning\fP, \fBcta-tape-acs-mount\fP is a developer tool and is therefore
+\fBWarning\fP, \fBcta-acs-mount\fP is a developer tool and is therefore
subject to change in and even removal from a future release of CTA.
End users should not rely on this tool to operate their CTA installation.
-\fBcta-tape-acs-mount\fP mounts the volume with the specfied \fBVID\fP into
+\fBcta-acs-mount\fP mounts the volume with the specfied \fBVID\fP into
the drive located in the specified \fBDRIVE_SLOT\fP of the tape library.
The format of \fBDRIVE_SLOT\fP is as follows:
diff --git a/mediachanger/acs/cta-tape-acs-querydrive.1cta b/mediachanger/acs/cta-acs-querydrive.1cta
similarity index 88%
rename from mediachanger/acs/cta-tape-acs-querydrive.1cta
rename to mediachanger/acs/cta-acs-querydrive.1cta
index dade6364b1..f6359650d2 100644
--- a/mediachanger/acs/cta-tape-acs-querydrive.1cta
+++ b/mediachanger/acs/cta-acs-querydrive.1cta
@@ -16,16 +16,16 @@
.TH CTA-TAPE-ACS-QUERYDRIVE "1cta" "$Date: 2013/10/09 14:00:00 $" CTA "CTA"
.SH NAME
-cta-tape-acs-querydrive \- queries a drive
+cta-acs-querydrive \- queries a drive
.SH SYNOPSIS
-.BI "cta-tape-acs-querydrive [options] DRIVE_SLOT"
+.BI "cta-acs-querydrive [options] DRIVE_SLOT"
.SH DESCRIPTION
-\fBWarning\fP, \fBcta-tape-acs-querydrive\fP is a developer tool and is
+\fBWarning\fP, \fBcta-acs-querydrive\fP is a developer tool and is
therefore subject to change and even removal from a future release of CTA.
End users should not rely on this tool to operate their CTA installation.
-\fBcta-tape-acs-querydrive\fP quieries ACS for information about the drive
+\fBcta-acs-querydrive\fP quieries ACS for information about the drive
located in the specified \fBDRIVE_SLOT\fP. The format of \fBDRIVE_SLOT\fP
is as follows:
diff --git a/mediachanger/acs/cta-tape-acs-queryvolume.1cta b/mediachanger/acs/cta-acs-queryvolume.1cta
similarity index 95%
rename from mediachanger/acs/cta-tape-acs-queryvolume.1cta
rename to mediachanger/acs/cta-acs-queryvolume.1cta
index fa0a3705bb..e4c2a0c35f 100644
--- a/mediachanger/acs/cta-tape-acs-queryvolume.1cta
+++ b/mediachanger/acs/cta-acs-queryvolume.1cta
@@ -16,9 +16,9 @@
.TH CTA-TAPE-ACS-QUERYVOLUME "1cta" "$Date: 2013/10/09 14:00:00 $" CTA "CTA"
.SH NAME
-cta-tape-acs-queryvolume \- queries a volume
+cta-acs-queryvolume \- queries a volume
.SH SYNOPSIS
-.BI "cta-tape-acs-queryvolume [options] VID"
+.BI "cta-acs-queryvolume [options] VID"
.SH DESCRIPTION
\fBWarning\fP, \fBcastor-tape-acs-queryvolume\fP is a developer tool and is
--
GitLab