Commit 3ed15a73 authored by Matthew Smith's avatar Matthew Smith
Browse files

Make file out path more consistent

parent a6eaa6d7
......@@ -62,14 +62,14 @@ popd >/dev/null
dpkg-deb --build $WORKDIR ./$DEBFILE || exit
if [ "$CACHE_BUILDS" == "yes" ]
then mv ./$DEBFILE /var/lib/openvpn-server/openssl/builds/
if [ "$CACHE_BUILDS" == "yes" ] ; then
mv ./$DEBFILE /var/lib/openvpn-server/openssl/builds/
echo "Your OpenVPN Debian client has been built in /var/lib/openvpn-server/openssl/client_setup/$DEBFILE"
else echo "Your OpenVPN Debian client has been built $DEBFILE"
else
echo "Your OpenVPN Debian client has been built $DEBFILE"
fi
rm -rf $WORKDIR
allocate_ip()
echo "Your OpenVPN config file is ${OVPNFILE}"
......@@ -60,10 +60,12 @@ popd >/dev/null
OVPNFILE="openvpn-${FILEBASE}.ovpn"
cp ${WORKDIR}/${FILEBASE}.ovpn ./$OVPNFILE
if [ "$CACHE_BUILDS" == "yes" ]
then mv ${FILEBASE}.ovpn /var/lib/openvpn-server/openssl/builds/
if [ "$CACHE_BUILDS" == "yes" ]; then
mv ${FILEBASE}.ovpn /var/lib/openvpn-server/openssl/builds/
echo "Your OpenVPN generic client has been built in /var/lib/openvpn-server/openssl/builds/${OVPNFILE}"
else
echo "Your OpenVPN generic client has been built in ${OVPNFILE}"
fi
rm -rf $WORKDIR
if [ -z $1 ]; then
......@@ -90,4 +92,3 @@ fi
allocate_ip()
echo "Your OpenVPN config file is ${OVPNFILE}"
......@@ -48,10 +48,11 @@ makensis -NOCD ./openvpn-deploy.nsi >/dev/null 2>&1
popd >/dev/null
if [ "$CACHE_BUILDS" == "yes" ]
then mv $WORKDIR/sol1-openvpn-deploy.exe /var/lib/openvpn-server/openssl/builds/openvpn-${FILEBASE}.exe
if [ "$CACHE_BUILDS" == "yes" ]; then
mv $WORKDIR/sol1-openvpn-deploy.exe /var/lib/openvpn-server/openssl/builds/openvpn-${FILEBASE}.exe
echo "Your OpenVPN Windows client has been built in /var/lib/openvpn-server/openssl/builds/openvpn-${FILEBASE}.exe"
else mv $WORKDIR/sol1-openvpn-deploy.exe ./openvpn-${FILEBASE}.exe
else
mv $WORKDIR/sol1-openvpn-deploy.exe ./openvpn-${FILEBASE}.exe
echo "Your OpenVPN Windows client has been built in openvpn-${FILEBASE}.exe"
fi
......@@ -60,6 +61,5 @@ rm -rf $WORKDIR
allocate_ip()
echo "Your OpenVPN config file is ${OVPNFILE}"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment