Move Fedora keys and base_rpms to scripts_fedora dir

.gitignore

@@ -1,6 +1,4 @@
 *~
-base_rpms
-keys
 appmenus
 build_timestamp
 *.iso

scripts_fedora/.gitignore

@@ -0,0 +1,2 @@
+keys
+base_rpms

scripts_fedora/00_prepare.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 
+pushd $SCRIPTSDIR
 rm -f keys base_rpms
 ln -sf keys_$DIST keys
 ln -sf base_rpms_$DIST base_rpms
+popd
 
 createrepo -q -g $PWD/comps-qubes-template.xml yum_repo_qubes/$DIST -o yum_repo_qubes/$DIST

scripts_fedora/01_install_core.sh

@@ -2,11 +2,11 @@
 
 echo "-> Initializing RPM database..."
 rpm --initdb --root=$INSTALLDIR
-rpm --import --root=$INSTALLDIR keys/*
+rpm --import --root=$INSTALLDIR $SCRIPTSDIR/keys/*
 
 echo "-> Installing core RPM packages..."
-rpm -i --root=$INSTALLDIR base_rpms/*.rpm || exit 1
+rpm -i --root=$INSTALLDIR $SCRIPTSDIR/base_rpms/*.rpm || exit 1
 
-cp scripts_"${DIST}"/resolv.conf $INSTALLDIR/etc
-cp scripts_"${DIST}"/network $INSTALLDIR/etc/sysconfig
+cp $SCRIPTSDIR/resolv.conf $INSTALLDIR/etc
+cp $SCRIPTSDIR/network $INSTALLDIR/etc/sysconfig
 cp -a /dev/null /dev/zero /dev/random /dev/urandom $INSTALLDIR/dev/