mirror of
				https://github.com/dockur/windows.git
				synced 2025-11-03 22:04:29 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			c0377de00c
			...
			3b347d92e0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					3b347d92e0 | 
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -8,13 +8,12 @@
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
      "onAutoForward": "notify"
 | 
			
		||||
      "onAutoForward": "openBrowser"
 | 
			
		||||
    }
 | 
			
		||||
  },
 | 
			
		||||
  "otherPortsAttributes": {
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "../codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -1,8 +1,9 @@
 | 
			
		||||
services:
 | 
			
		||||
  windows:
 | 
			
		||||
    image: dockurr/windows
 | 
			
		||||
    container_name: windows
 | 
			
		||||
    image: ghcr.io/dockur/windows
 | 
			
		||||
    environment:
 | 
			
		||||
      ALLOCATE: "Y"
 | 
			
		||||
      RAM_SIZE: "half"
 | 
			
		||||
      DISK_SIZE: "max"
 | 
			
		||||
      CPU_CORES: "max"
 | 
			
		||||
 | 
			
		||||
@ -4,7 +4,6 @@
 | 
			
		||||
  "containerEnv": {
 | 
			
		||||
    "VERSION": "11"
 | 
			
		||||
  },
 | 
			
		||||
  "forwardPorts": [8006],
 | 
			
		||||
  "portsAttributes": {
 | 
			
		||||
    "8006": {
 | 
			
		||||
      "label": "Web",
 | 
			
		||||
@ -15,6 +14,5 @@
 | 
			
		||||
    "onAutoForward": "ignore"
 | 
			
		||||
  }, 
 | 
			
		||||
  "dockerComposeFile": "codespaces.yml",
 | 
			
		||||
  "workspaceFolder": "/workspaces/windows",
 | 
			
		||||
  "initializeCommand": "docker system prune --all --force"
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -1108,14 +1108,14 @@ getLink4() {
 | 
			
		||||
      url="nano11_25h2/nano11%2025h2.iso"
 | 
			
		||||
      ;;
 | 
			
		||||
    "core11" )
 | 
			
		||||
      size=3176654848
 | 
			
		||||
      sum="29c055fcfb7b089abd9e007e7abe4bb82c70a03aac9d65e56a38b87ab32d04d2"
 | 
			
		||||
      url="tiny11_25H2/tiny11core_25H2_Oct25.iso"
 | 
			
		||||
      size=2159738880
 | 
			
		||||
      sum="78f0f44444ff95b97125b43e560a72e0d6ce0a665cf9f5573bf268191e5510c1"
 | 
			
		||||
      url="tiny-11-core-x-64-beta-1/tiny11%20core%20x64%20beta%201.iso"
 | 
			
		||||
      ;;
 | 
			
		||||
    "tiny11" )
 | 
			
		||||
      size=5514559488
 | 
			
		||||
      sum="92484f2b7f707e42383294402a9eabbadeaa5ede80ac633390ae7f3537e36275"
 | 
			
		||||
      url="tiny11_25H2/tiny11_25H2_Oct25.iso"
 | 
			
		||||
      size=3788177408
 | 
			
		||||
      sum="a028800a91addc35d8ae22dce7459b67330f7d69d2f11c70f53c0fdffa5b4280"
 | 
			
		||||
      url="tiny11-2311/tiny11%202311%20x64.iso"
 | 
			
		||||
      ;;
 | 
			
		||||
    "tiny10" )
 | 
			
		||||
      size=3839819776
 | 
			
		||||
@ -1123,9 +1123,9 @@ getLink4() {
 | 
			
		||||
      url="tiny-10-23-h2/tiny10%20x64%2023h2.iso"
 | 
			
		||||
      ;;
 | 
			
		||||
    "win11x64" )
 | 
			
		||||
      size=7736125440
 | 
			
		||||
      sum="d141f6030fed50f75e2b03e1eb2e53646c4b21e5386047cb860af5223f102a32"
 | 
			
		||||
      url="W11x64_26200.6584/26200.6584.250915-1905.25h2_ge_release_svc_refresh_CLIENT_CONSUMER_x64FRE_en-us.iso"
 | 
			
		||||
      size=5819484160
 | 
			
		||||
      sum="b56b911bf18a2ceaeb3904d87e7c770bdf92d3099599d61ac2497b91bf190b11"
 | 
			
		||||
      url="windows-11-24h2-x64/Windows%2011%2024H2%20x64.iso"
 | 
			
		||||
      ;;
 | 
			
		||||
    "win11x64-enterprise" | "win11x64-enterprise-eval" )
 | 
			
		||||
      size=6209064960
 | 
			
		||||
 | 
			
		||||
@ -341,8 +341,8 @@ extractESD() {
 | 
			
		||||
  local desc="$4"
 | 
			
		||||
  local size size_gb space space_gb desc
 | 
			
		||||
 | 
			
		||||
  local msg="Extracting $desc bootdisk"
 | 
			
		||||
  info "$msg..." && html "$msg..."
 | 
			
		||||
  local msg="Extracting $desc bootdisk..."
 | 
			
		||||
  info "$msg" && html "$msg"
 | 
			
		||||
 | 
			
		||||
  if [ "$(stat -c%s "$iso")" -lt 100000000 ]; then
 | 
			
		||||
    error "Invalid ESD file: Size is smaller than 100 MB" && return 1
 | 
			
		||||
@ -367,51 +367,38 @@ extractESD() {
 | 
			
		||||
    error "Cannot read the image count in ESD file!" && return 1
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  /run/progress.sh "$dir" "0" "$msg ([P])..." &
 | 
			
		||||
 | 
			
		||||
  wimlib-imagex apply "$iso" 1 "$dir" --quiet 2>/dev/null || {
 | 
			
		||||
    retVal=$?
 | 
			
		||||
    fKill "progress.sh"
 | 
			
		||||
    error "Extracting $desc bootdisk failed ($retVal)" && return 1
 | 
			
		||||
    error "Extracting $desc bootdisk failed" && return $retVal
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fKill "progress.sh"
 | 
			
		||||
 | 
			
		||||
  local bootWimFile="$dir/sources/boot.wim"
 | 
			
		||||
  local installWimFile="$dir/sources/install.wim"
 | 
			
		||||
 | 
			
		||||
  local msg="Extracting $desc environment"
 | 
			
		||||
  info "$msg..." && html "$msg..."
 | 
			
		||||
  /run/progress.sh "$bootWimFile" "0" "$msg ([P])..." &
 | 
			
		||||
  local msg="Extracting $desc environment..."
 | 
			
		||||
  info "$msg" && html "$msg"
 | 
			
		||||
 | 
			
		||||
  wimlib-imagex export "$iso" 2 "$bootWimFile" --compress=none --quiet || {
 | 
			
		||||
    retVal=$?
 | 
			
		||||
    fKill "progress.sh"
 | 
			
		||||
    error "Adding WinPE failed ($retVal)" && return 1
 | 
			
		||||
    error "Adding WinPE failed" && return ${retVal}
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fKill "progress.sh"
 | 
			
		||||
 | 
			
		||||
  local msg="Extracting $desc setup"
 | 
			
		||||
  info "$msg..." && html "$msg..."
 | 
			
		||||
  /run/progress.sh "$bootWimFile" "0" "$msg ([P])..." &
 | 
			
		||||
  local msg="Extracting $desc setup..."
 | 
			
		||||
  info "$msg" && html "$msg"
 | 
			
		||||
 | 
			
		||||
  wimlib-imagex export "$iso" 3 "$bootWimFile" --compress=none --boot --quiet || {
 | 
			
		||||
   retVal=$?
 | 
			
		||||
   fKill "progress.sh"
 | 
			
		||||
   error "Adding Windows Setup failed ($retVal)" && return 1
 | 
			
		||||
   error "Adding Windows Setup failed" && return ${retVal}
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  fKill "progress.sh"
 | 
			
		||||
 | 
			
		||||
  if [[ "${PLATFORM,,}" == "x64" ]]; then
 | 
			
		||||
    LABEL="CCCOMA_X64FRE_EN-US_DV9"
 | 
			
		||||
  else
 | 
			
		||||
    LABEL="CPBA_A64FRE_EN-US_DV9"
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  local msg="Extracting $desc image"
 | 
			
		||||
  info "$msg..." && html "$msg..."
 | 
			
		||||
  local msg="Extracting $desc image..."
 | 
			
		||||
  info "$msg" && html "$msg"
 | 
			
		||||
 | 
			
		||||
  local edition imageIndex imageEdition
 | 
			
		||||
  edition=$(getCatalog "$version" "name")
 | 
			
		||||
@ -420,21 +407,16 @@ extractESD() {
 | 
			
		||||
    error "Invalid VERSION specified, value \"$version\" is not recognized!" && return 1
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  /run/progress.sh "$installWimFile" "0" "$msg ([P])..." &
 | 
			
		||||
 | 
			
		||||
  for (( imageIndex=4; imageIndex<=esdImageCount; imageIndex++ )); do
 | 
			
		||||
    imageEdition=$(wimlib-imagex info "$iso" ${imageIndex} | grep '^Description:' | sed 's/Description:[ \t]*//')
 | 
			
		||||
    [[ "${imageEdition,,}" != "${edition,,}" ]] && continue
 | 
			
		||||
    wimlib-imagex export "$iso" ${imageIndex} "$installWimFile" --compress=LZMS --chunk-size 128K --quiet || {
 | 
			
		||||
      retVal=$?
 | 
			
		||||
      fKill "progress.sh"
 | 
			
		||||
      error "Addition of $imageIndex to the $desc image failed ($retVal)" && return 1
 | 
			
		||||
      error "Addition of $imageIndex to the $desc image failed" && return $retVal
 | 
			
		||||
    }
 | 
			
		||||
    fKill "progress.sh"
 | 
			
		||||
    return 0
 | 
			
		||||
  done
 | 
			
		||||
 | 
			
		||||
  fKill "progress.sh"
 | 
			
		||||
  error "Failed to find product '$edition' in install.wim!" && return 1
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@ -458,8 +440,8 @@ extractImage() {
 | 
			
		||||
    return 1
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  local msg="Extracting $desc image"
 | 
			
		||||
  info "$msg..." && html "$msg..."
 | 
			
		||||
  local msg="Extracting $desc image..."
 | 
			
		||||
  info "$msg" && html "$msg"
 | 
			
		||||
 | 
			
		||||
  rm -rf "$dir"
 | 
			
		||||
  mkdir -p "$dir"
 | 
			
		||||
@ -478,15 +460,11 @@ extractImage() {
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  rm -rf "$dir"
 | 
			
		||||
  /run/progress.sh "$dir" "$size" "$msg ([P])..." &
 | 
			
		||||
 | 
			
		||||
  if ! 7z x "$iso" -o"$dir" > /dev/null; then
 | 
			
		||||
    fKill "progress.sh"
 | 
			
		||||
    error "Failed to extract ISO file: $iso" && return 1
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  fKill "progress.sh"
 | 
			
		||||
 | 
			
		||||
  if [[ "${UNPACK:-}" != [Yy1]* ]]; then
 | 
			
		||||
 | 
			
		||||
    LABEL=$(isoinfo -d -i "$iso" | sed -n 's/Volume id: //p')
 | 
			
		||||
@ -1099,8 +1077,8 @@ buildImage() {
 | 
			
		||||
 | 
			
		||||
  desc=$(printVersion "$DETECTED" "ISO")
 | 
			
		||||
 | 
			
		||||
  local msg="Building $desc image"
 | 
			
		||||
  info "$msg..." && html "$msg..."
 | 
			
		||||
  local msg="Building $desc image..."
 | 
			
		||||
  info "$msg" && html "$msg"
 | 
			
		||||
 | 
			
		||||
  [ -z "$LABEL" ] && LABEL="Windows"
 | 
			
		||||
 | 
			
		||||
@ -1117,8 +1095,6 @@ buildImage() {
 | 
			
		||||
    error "Not enough free space in $STORAGE, have $space_gb available but need at least $size_gb." && return 1
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  /run/progress.sh "$out" "$size" "$msg ([P])..." &
 | 
			
		||||
 | 
			
		||||
  if [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
 | 
			
		||||
 | 
			
		||||
    genisoimage -o "$out" -b "$ETFS" -no-emul-boot -c "$cat" -iso-level 4 -J -l -D -N -joliet-long -relaxed-filenames -V "${LABEL::30}" \
 | 
			
		||||
@ -1139,8 +1115,6 @@ buildImage() {
 | 
			
		||||
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  fKill "progress.sh"
 | 
			
		||||
 | 
			
		||||
  if [ -n "$failed" ]; then
 | 
			
		||||
    [ -s "$log" ] && echo "$(<"$log")"
 | 
			
		||||
    error "Failed to build image!" && return 1
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user