GovReady / govready

Toolkit for getting open source apps ready for secure, approved government use
GNU General Public License v3.0
97 stars 31 forks source link

Super minor UX change that puts each remote host in their own subdirectory #86

Closed openprivacy closed 8 years ago

openprivacy commented 8 years ago

Not sure why it says it can't automatically merge this - seems to be a single character change. I'm using this change now for a client and it's much better for remote scanning.

gregelin commented 8 years ago

@openprivacy Here is the conflict that is showing up in the merge code, starting at line 822.

I am not sure why the side-by-side file comparison is not showing the same thing.

    # Check to see if we are to scan a remote machine using oscap-ssh.
    if [ -n "${OSCAP_USER+x}" ] && [ -n "${OSCAP_HOST+x}" ] && [ -n "${OSCAP_PORT+x}" ]; then
<<<<<<< HEAD
    if [ -n "${OSCAP_SUDO+x}" ] && [ "${OSCAP_SUDO}" ]; then
        SUDO_ARG='sudo'
    else
        SUDO_ARG=''
    fi
        OSCAP_COMMAND="oscap-ssh ${SUDO_ARG} ${OSCAP_USER}@${OSCAP_HOST} ${OSCAP_PORT}"
        RESULTS_DIR=${SCANDIR}/${PROFILE}-${OSCAP_HOST}
=======
        OSCAP_COMMAND="oscap-ssh ${OSCAP_USER}@${OSCAP_HOST} ${OSCAP_PORT}"
        RESULTS_DIR=${SCANDIR}/${PROFILE}/${OSCAP_HOST}
>>>>>>> ceb54a9c0b5e3c4fa4a52a08bd809212827ad239
        SSH_HOST="${OSCAP_USER}@${OSCAP_HOST}"
gregelin commented 8 years ago

@fen Temporarily commented out conflicting code, but we need to test together.

openprivacy commented 8 years ago

Yeah, things got confused as I made both my pull requests from master, and I see there is some conflicting code. Fixing...