From 8e7f0b0280c53def0d6992d098f8b4ff8078011a Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sat, 16 Feb 2013 16:05:58 +0100 Subject: [PATCH] Move Fedora-specific 3rd party software scripts to fedora dir --- scripts_fc17/04_install_qubes.sh | 2 +- .../adobe-release-x86_64-1.0-1.noarch.rpm | Bin .../add_3rd_party_software.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {3rd_party_software => scripts_fc17/3rd_party_software}/adobe-release-x86_64-1.0-1.noarch.rpm (100%) rename add_3rd_party_software.sh => scripts_fc17/add_3rd_party_software.sh (67%) diff --git a/scripts_fc17/04_install_qubes.sh b/scripts_fc17/04_install_qubes.sh index 2cba51b..560e977 100755 --- a/scripts_fc17/04_install_qubes.sh +++ b/scripts_fc17/04_install_qubes.sh @@ -7,6 +7,6 @@ export YUM0=$PWD/yum_repo_qubes yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$(pwd)/mnt @qubes-vm echo "--> Installing 3rd party apps" -./add_3rd_party_software.sh +$SCRIPTSDIR/add_3rd_party_software.sh sudo umount $PWD/proc diff --git a/3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm b/scripts_fc17/3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm similarity index 100% rename from 3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm rename to scripts_fc17/3rd_party_software/adobe-release-x86_64-1.0-1.noarch.rpm diff --git a/add_3rd_party_software.sh b/scripts_fc17/add_3rd_party_software.sh similarity index 67% rename from add_3rd_party_software.sh rename to scripts_fc17/add_3rd_party_software.sh index b682b5d..712f928 100755 --- a/add_3rd_party_software.sh +++ b/scripts_fc17/add_3rd_party_software.sh @@ -2,6 +2,6 @@ INSTALLDIR=$PWD/mnt -rpm -i --root=$INSTALLDIR 3rd_party_software/adobe-release-x86_64-*.noarch.rpm +rpm -i --root=$INSTALLDIR $SCRIPTSDIR/3rd_party_software/adobe-release-x86_64-*.noarch.rpm rpm --import --root=$INSTALLDIR mnt/etc/pki/rpm-gpg/RPM-GPG-KEY-adobe-linux yum install -c $PWD/yum.conf $YUM_OPTS -y --installroot=$INSTALLDIR flash-plugin