Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing 0-byte credential creator issue #2011

Merged
merged 5 commits into from
Jun 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions tools/gvm-lsc-deb-creator
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,7 @@ COPYRIGHT_FILE="${DOC_DATA_DIR}/copyright"
} > "${COPYRIGHT_FILE}"

# Create data archive
cd "${DATA_DIR}"
tar -C "${DATA_DIR}" -z -cf "../data.tar.gz" "${HOME_SUBDIR}" "${DOC_SUBDIR}"

tar -P -z -cf "${TEMP_DIR}/data.tar.gz" "${PACKAGE_BASE_DIR}/${HOME_DATA_SUBDIR}" "${PACKAGE_BASE_DIR}/${DOC_DATA_SUBDIR}"

#
# Create control files
Expand Down
2 changes: 2 additions & 0 deletions tools/gvm-lsc-rpm-creator
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ SPEC_FILE="${SPEC_DIR}/${PACKAGE_NAME_VERSION}.spec"
echo "BuildArch: noarch"
# Put output in current directory
echo "%define _rpmdir %(pwd)"
# Set _topdir
echo "%define _topdir ${TEMP_DIR}"

# Create description section
echo "%description"
Expand Down
6 changes: 3 additions & 3 deletions tools/template.nsis
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ Section
; Create user and add it to the Administrators group
DetailPrint `Creating user ${__USERNAME__}`
SetDetailsPrint none
ExecWait `cmd /C net user ${__USERNAME__} "${__PASSWORD__}" /add /active:yes`
ExecWait 'cmd /C net user ${__USERNAME__} "${__PASSWORD__}" /add /active:yes'
SetDetailsPrint both
ExecWait `cmd /C net localgroup $ADMINGROUPNAME %COMPUTERNAME%\${__USERNAME__} /add`
ExecWait 'cmd /C net localgroup $ADMINGROUPNAME %COMPUTERNAME%\${__USERNAME__} /add'

; Remove temporary files for localized admin group names
Delete $TEMPVBSFILE
Expand All @@ -81,7 +81,7 @@ SectionEnd
; Uninstaller section
Section Uninstall

ExecWait "net user ${__USERNAME__} /delete"
ExecWait 'net user ${__USERNAME__} /delete'

; Display message that everything seems to be fine
MessageBox MB_OK "A user has been removed. You can now safely remove the uninstaller from your Desktop."
Expand Down