@@ -78,6 +78,10 @@ case "${1}" in
7878 [ -n " ${GITHUB_ENV} " ] && echo " PAWPAW_PACK_NAME=${1} -$( sw_vers -productVersion | cut -d ' .' -f 1) " >> " ${GITHUB_ENV} "
7979 ;;
8080 * )
81+ if [ " $( id -u) " -ne 0 ] && [ -e /usr/bin/sudo ]; then
82+ exec /usr/bin/sudo $0 " $@ "
83+ fi
84+
8185 apt-get update -qq
8286 apt-get install -yqq autoconf automake build-essential curl cmake file git jq libglib2.0-dev-bin libtool lsb-release make meson gperf patchelf pkg-config uuid-dev zlib1g-dev
8387
@@ -100,10 +104,10 @@ case "${1}" in
100104 fi
101105 dpkg --add-architecture ${linux_arch}
102106 apt-get update -qq
103- apt-get install -yqq \
107+ apt-get install -yqq --allow-downgrades \
104108 binfmt-support \
105109 qemu-user-static \
106- qtbase5 -dev-tools \
110+ x11proto -dev x11proto-render-dev \
107111 libasound2-dev:${linux_arch} \
108112 libdbus-1-dev:${linux_arch} \
109113 libfftw3-dev:${linux_arch} \
@@ -112,16 +116,19 @@ case "${1}" in
112116 libglib2.0-dev:${linux_arch} \
113117 libpcre2-dev:${linux_arch} \
114118 libpcre3-dev:${linux_arch} \
115- libqt5svg5 -dev:${linux_arch} \
119+ libvulkan -dev:${linux_arch} \
116120 libx11-dev:${linux_arch} \
117121 libxcb1-dev:${linux_arch} \
118122 libxcursor-dev:${linux_arch} \
119123 libxext-dev:${linux_arch} \
120124 libxfixes-dev:${linux_arch} \
121125 libxrandr-dev:${linux_arch} \
122126 libxrender-dev:${linux_arch} \
123- qtbase5-dev:${linux_arch} \
124127 uuid-dev:${linux_arch}
128+ apt-get install -yqq --allow-downgrades \
129+ qtbase5-dev-tools \
130+ libqt5svg5-dev:${linux_arch} \
131+ qtbase5-dev:${linux_arch}
125132 elif [ " ${1} " = " win32" ] || [ " ${1} " = " win64" ]; then
126133 dpkg --add-architecture i386
127134 apt-get update -qq
@@ -146,3 +153,6 @@ case "${1}" in
146153 [ -n " ${GITHUB_ENV} " ] && echo " PAWPAW_PACK_NAME=${1} -${release} " >> " ${GITHUB_ENV} "
147154 ;;
148155esac
156+
157+ # if we reach this point in the script, make sure to return/exit 0
158+ exit 0
0 commit comments