aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas C. Villa Real <lucasvr@gmail.com>2016-12-08 22:26:02 -0200
committerLucas C. Villa Real <lucasvr@gmail.com>2016-12-08 22:26:02 -0200
commitc7ce3b6cae997bf5be0756cfcd629a4596abbbff (patch)
treee48a3e887407e979cde2f7429c834b13b99262a9
parentf7ee318f5e40ab3774433a9ec4a6ffe134bc871d (diff)
downloadThirdPartyInstallers-c7ce3b6cae997bf5be0756cfcd629a4596abbbff.tar.xz
Rename function.
-rwxr-xr-xbin/InstallPackage-RPM10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/InstallPackage-RPM b/bin/InstallPackage-RPM
index f39ff5e..f8ca448 100755
--- a/bin/InstallPackage-RPM
+++ b/bin/InstallPackage-RPM
@@ -47,7 +47,7 @@ function flatten_rpm() {
Log_Normal "Flattening directory structure."
- function flatten_rpm_1_level() {
+ function flatten_opt_1_level() {
# Flatten 1-level dir: opt/pkgname/{bin,sbin,...}
cp -va ./opt/*/* .
for pkgdir in $(basename ./opt/*)
@@ -57,7 +57,7 @@ function flatten_rpm() {
realpath ./opt/* | sed "s,$(realpath $PWD),,g" >> Resources/UnmanagedFiles
}
- function flatten_rpm_2_levels() {
+ function flatten_opt_2_levels() {
# Flatten 2-levels dir: opt/vendorname/pkgname/{bin,sbin,...}
cp -va ./opt/*/*/* .
for vendordir in $(basename ./opt/*)
@@ -88,13 +88,13 @@ function flatten_rpm() {
mkdir -p Resources/Unmanaged/opt
if ls ./opt/* 2> /dev/null | grep -q "$rootdirs"
then
- flatten_rpm_1_level
+ flatten_opt_1_level
elif ls ./opt/*/* 2> /dev/null | grep -q "$rootdirs"
then
- flatten_rpm_2_levels
+ flatten_opt_2_levels
else
Log_Error "Could not determine this package's /opt structure, assuming 1-level"
- flatten_rpm_1_level
+ flatten_opt_1_level
fi
rm -rf -- ./opt
fi